diff --git a/OpenRA.Game/ModData.cs b/OpenRA.Game/ModData.cs
index 71b476ffc6..bfddbcf23a 100755
--- a/OpenRA.Game/ModData.cs
+++ b/OpenRA.Game/ModData.cs
@@ -43,11 +43,21 @@ namespace OpenRA
 		}
 		
 		// TODO: Do this nicer
+        IEnumerable<string> FindMapsIn(string dir)
+        {
+            string[] NoMaps = { };
+
+            if (!Directory.Exists(dir))
+                return NoMaps;
+
+            // todo: look for compressed maps too.
+            return Directory.GetDirectories(dir);
+        }
+
 		Dictionary<string, MapStub> FindMaps(string[] mods)
 		{
-			var paths = new[] { "maps/" }.Concat(mods.Select(m => "mods/" + m + "/maps/"))
-				.Where(p => Directory.Exists(p))
-				.SelectMany(p => Directory.GetDirectories(p)).ToList();
+            var paths = new[] { "maps/" }.Concat(mods.Select(m => "mods/" + m + "/maps/"))
+                .SelectMany(p => FindMapsIn(p));
 
 			return paths.Select(p => new MapStub(new Folder(p, int.MaxValue))).ToDictionary(m => m.Uid);
 		}