diff --git a/files/dos_fs.c b/files/dos_fs.c
index 95414528e4b..d7cfecffa00 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -824,16 +824,16 @@ BOOL32 DOSFS_GetFullName( LPCSTR name, BOOL32 check_last, DOS_FULL_NAME *full )
 
     if (!found)
     {
-        if (check_last)
-        {
-            DOS_ERROR( ER_FileNotFound, EC_NotFound, SA_Abort, EL_Disk );
-            return FALSE;
-        }
         if (*name)  /* Not last */
         {
             DOS_ERROR( ER_PathNotFound, EC_NotFound, SA_Abort, EL_Disk );
             return FALSE;
         }
+        if (check_last)
+        {
+            DOS_ERROR( ER_FileNotFound, EC_NotFound, SA_Abort, EL_Disk );
+            return FALSE;
+        }
     }
     if (!full->long_name[0]) strcpy( full->long_name, "/" );
     if (!full->short_name[2]) strcpy( full->short_name + 2, "\\" );