diff --git a/lib/krb5/keyblock.c b/lib/krb5/keyblock.c
index 70378b64e..b77f317bc 100644
--- a/lib/krb5/keyblock.c
+++ b/lib/krb5/keyblock.c
@@ -42,8 +42,10 @@ void
 krb5_free_keyblock_contents(krb5_context context,
 			    krb5_keyblock *keyblock)
 {
-    memset(keyblock->keyvalue.data, 0, keyblock->keyvalue.length);
-    krb5_data_free (&keyblock->keyvalue);
+    if(keyblock){
+	memset(keyblock->keyvalue.data, 0, keyblock->keyvalue.length);
+	krb5_data_free (&keyblock->keyvalue);
+    }
 }
 
 void