diff --git a/src/findfile.c b/src/findfile.c
index b4aed04..4f457b9 100644
--- a/src/findfile.c
+++ b/src/findfile.c
@@ -1735,11 +1735,11 @@
     proc->pr_WindowPtr = (APTR)-1L;
 # endif
 
-    if (len == 0)
-	return NULL;
-
     if (first == TRUE)
     {
+	if (len == 0)
+	    return NULL;
+
 	// copy file name into NameBuff, expanding environment variables
 	save_char = ptr[len];
 	ptr[len] = NUL;