diff --git a/src/userfunc.c b/src/userfunc.c
index 4072349..fc6cea3 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -4152,13 +4152,11 @@
 	    else
 		eap->skip = TRUE;
 	}
-	if (name == NULL)
-	    goto ret_free;  // out of memory
 
 	// For "export def FuncName()" in an autoload script the function name
 	// is stored with the legacy autoload name "dir#script#FuncName" so
 	// that it can also be found in legacy script.
-	if (is_export)
+	if (is_export && name != NULL)
 	    name = may_prefix_autoload(name);
     }