diff --git a/source/src/main.cpp b/source/src/main.cpp
index 1f486964..448b6c35 100644
--- a/source/src/main.cpp
+++ b/source/src/main.cpp
@@ -895,9 +895,13 @@ const char *rndmapname()
 {
     vector<char *> maps;
     listfiles("packages/maps/official", "cgz", maps);
-    char *map = newstring(maps[rnd(maps.length())]);
-    maps.deletearrays();
-    return map;
+    if (maps.length() > 0)
+    {
+        char *map = newstring(maps[rnd(maps.length())]);
+        maps.deletearrays();
+        return map;
+    }
+    else return "";
 }
 
 extern void connectserv(char *, int *, char *);