diff --git a/lib/krb5/expand_path.c b/lib/krb5/expand_path.c
index a1f4dfcfc..a0402350d 100644
--- a/lib/krb5/expand_path.c
+++ b/lib/krb5/expand_path.c
@@ -55,8 +55,8 @@ _krb5_expand_path_tokens(krb5_context context,
 			 int filepath,
 			 char **ppath_out)
 {
-    return heim_expand_path_tokens(context->hcontext, path_in, filepath,
-                                   ppath_out, NULL);
+    return heim_expand_path_tokens(context ? context->hcontext : NULL, path_in,
+                                   filepath, ppath_out, NULL);
 }
 
 /**