rejection when highlighting with invalid model id

frontend-js/src/main/js/map/overlay/UserDbOverlay.js

@@ -56,7 +56,11 @@ UserDbOverlay.prototype._createIdentifiedElements = function(params, sourceArray
       return Promise.reject(new Error("Element already highlighted: " + element.getId()));
     }
     result.push(element);
-    promises.push(self.getMap().getSubmapById(element.getModelId()).getModel().getByIdentifiedElement(element));
+    var submap = self.getMap().getSubmapById(element.getModelId());
+    if (submap === null) {
+      return Promise.reject(new InvalidArgumentError("Submap doesn't exist: " + result[i].getModelId()));
+    }
+    promises.push(submap.getModel().getByIdentifiedElement(element));
   }
   return Promise.all(promises).then(function(elementsFromModel) {
     for (var i = 0; i < elementsFromModel.length; i++) {

frontend-js/src/test/js/map/overlay/UserDbOverlay-test.js

@@ -85,4 +85,30 @@ describe('UserDbOverlay', function() {
     });
   });
 
+  it("add to unexisting map", function() {
+    var overlay;
+    return ServerConnector.getProject().then(function(project) {
+      var options = helper.createCustomMapOptions(project);
+      var map = new CustomMap(options);
+      overlay = new UserDbOverlay({
+        map : map,
+        name : 'user'
+      });
+      return overlay.addMarker({
+        element : {
+          id : 329171,
+          modelId : -1,
+          type : "ALIAS"
+        },
+        options : {
+          type : "SURFACE"
+        }
+      });
+    }).then(function() {
+      assert.ok(false, "Exception expected");
+    }, function(error) {
+      assert.ok(error instanceof InvalidArgumentError)
+    });
+  });
+
 });