--- a/src/yadex.cc	Mon Sep 26 13:46:17 2011 +0300
+++ b/src/yadex.cc	Mon Sep 26 17:05:58 2011 +0300
@@ -707,17 +707,25 @@
             }
             else
             {
-                if (FindMasterDir(MasterDir, com))
+                MDirPtr entry = FindMasterDir(MasterDir, com);
+                if (entry != NULL)
+                {
+                    level_name = strdup(entry->dir.name);
+                }
+                else
                 {
                     printf("Level '%s' not found.", com);
+
                     // Hint absent-minded users
                     if ((tolower(*com) == 'e' && yg_level_name == YGLN_MAP01) ||
                         (tolower(*com) == 'm' && yg_level_name == YGLN_E1M1))
                         printf(" You are in %s mode.", Game);
                     else
+
                     if (tolower(*com) == 'e' && com[1] > '1' && !Registered)
-                        printf(" You have the shareware iwad.");
-                    putchar('\n');
+                        printf(" You have the shareware IWAD.");
+
+                    printf("\n");
                     continue;
                 }
             }