diff --git a/lib/krb5/init_creds.c b/lib/krb5/init_creds.c
index c443bf1ee..83959a499 100644
--- a/lib/krb5/init_creds.c
+++ b/lib/krb5/init_creds.c
@@ -133,7 +133,7 @@ void KRB5_LIB_FUNCTION
 krb5_get_init_creds_opt_free(krb5_context context,
 			     krb5_get_init_creds_opt *opt)
 {
-    if (opt->opt_private == NULL)
+    if (opt == NULL || opt->opt_private == NULL)
 	return;
     if (opt->opt_private->refcount < 1) /* abort ? */
 	return;