diff --git a/src/map/maplist.cpp b/src/map/maplist.cpp
index e27cba2d..d86e965f 100644
--- a/src/map/maplist.cpp
+++ b/src/map/maplist.cpp
@@ -17,13 +17,9 @@ bool MapList::loadMap(Map *map, const QString &path)
 	if (map && map->isValid()) {
 		_maps.append(map);
 		return true;
-	} else if (map) {
-		_errorPath = path;
-		_errorString = map->errorString();
-		return false;
 	} else {
-		_errorString = path;
-		_errorString = "Unknown file format";
+		_errorPath = path;
+		_errorString = (map) ? map->errorString() : "Unknown file format";
 		return false;
 	}
 }