diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 0a7c44d5..0ce537cc 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-25  Marcus Brinkmann  <marcus@g10code.de>
+
+	* key.c (gpgme_key_get_string_attr): Fix validity attribute.
+
 2003-04-24  Marcus Brinkmann  <marcus@g10code.de>
 	
 	* gpgme.h (struct _gpgme_op_genkey_result): New structure.
diff --git a/gpgme/key.c b/gpgme/key.c
index af87ac95..e6563a82 100644
--- a/gpgme/key.c
+++ b/gpgme/key.c
@@ -739,7 +739,7 @@ gpgme_key_get_string_attr (GpgmeKey key, GpgmeAttr what,
       return uid ? uid->comment_part : NULL;
 
     case GPGME_ATTR_VALIDITY:
-      return validity_to_string (key->otrust);
+      return uid ? validity_to_string (uid->validity) : NULL;
 
     case GPGME_ATTR_KEY_CAPS:    
       return subkey ? capabilities_to_string (subkey) : NULL;