=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js	2015-09-09 23:19:52 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js	2015-09-11 23:57:34 +0000
@@ -2556,6 +2556,10 @@
                     elementUrl = elementMap[view.columns[0].objectName],
                     id = view.columns[0].items[0].id;
 
+                if (!elementUrl) {
+                    fn();
+                }
+
                 Ext.Ajax.request({
                     url: gis.init.contextPath + '/api/' + elementUrl + '.json?fields=legendSet[id,name]&paging=false&filter=id:eq:' + id,
                     success: function(r) {

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js	2015-09-11 23:52:16 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js	2015-09-11 23:57:34 +0000
@@ -3876,6 +3876,11 @@
                     elementUrl = elementMap[view.columns[0].objectName],
                     id = view.columns[0].items[0].id;
 
+                if (!elementUrl) {
+                    fn();
+                    return;
+                }
+
                 gis.ajax({
                     url: gis.init.contextPath + '/api/' + elementUrl + '.json?fields=legendSet[id,name]&paging=false&filter=id:eq:' + id,
                     success: function(r) {

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js	2015-09-11 23:52:16 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js	2015-09-11 23:57:34 +0000
@@ -3876,6 +3876,11 @@
                     elementUrl = elementMap[view.columns[0].objectName],
                     id = view.columns[0].items[0].id;
 
+                if (!elementUrl) {
+                    fn();
+                    return;
+                }
+
                 gis.ajax({
                     url: gis.init.contextPath + '/api/' + elementUrl + '.json?fields=legendSet[id,name]&paging=false&filter=id:eq:' + id,
                     success: function(r) {

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js	2015-09-11 23:52:16 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js	2015-09-11 23:57:34 +0000
@@ -3876,6 +3876,11 @@
                     elementUrl = elementMap[view.columns[0].objectName],
                     id = view.columns[0].items[0].id;
 
+                if (!elementUrl) {
+                    fn();
+                    return;
+                }
+
                 gis.ajax({
                     url: gis.init.contextPath + '/api/' + elementUrl + '.json?fields=legendSet[id,name]&paging=false&filter=id:eq:' + id,
                     success: function(r) {