=== 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-07-15 21:40:39 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js	2015-07-15 22:48:48 +0000
@@ -1734,7 +1734,10 @@
 
 			// Legend
 			gis.viewport.eastRegion.doLayout();
-			layer.legendPanel.expand();
+
+            if (layer.legendPanel) {
+                layer.legendPanel.expand();
+            }
 
 			// Layer
 			if (layer.item) {
@@ -2544,7 +2547,10 @@
 
 			// Legend
 			gis.viewport.eastRegion.doLayout();
-			layer.legendPanel.expand();
+
+            if (layer.legendPanel) {
+                layer.legendPanel.expand();
+            }
 
 			// Layer
 			layer.setLayerOpacity(view.opacity);

=== 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-07-15 22:44:46 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js	2015-07-15 22:48:48 +0000
@@ -3221,7 +3221,10 @@
 
 			// Legend
 			gis.viewport.eastRegion.doLayout();
-			layer.legendPanel.expand();
+
+            if (layer.legendPanel) {
+                layer.legendPanel.expand();
+            }
 
 			// Layer
 			if (layer.item) {
@@ -4031,7 +4034,10 @@
 
 			// Legend
 			gis.viewport.eastRegion.doLayout();
-			layer.legendPanel.expand();
+
+            if (layer.legendPanel) {
+                layer.legendPanel.expand();
+            }
 
 			// Layer
 			layer.setLayerOpacity(view.opacity);

=== 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-07-15 22:44:46 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js	2015-07-15 22:48:48 +0000
@@ -3221,7 +3221,10 @@
 
 			// Legend
 			gis.viewport.eastRegion.doLayout();
-			layer.legendPanel.expand();
+
+            if (layer.legendPanel) {
+                layer.legendPanel.expand();
+            }
 
 			// Layer
 			if (layer.item) {
@@ -4031,7 +4034,10 @@
 
 			// Legend
 			gis.viewport.eastRegion.doLayout();
-			layer.legendPanel.expand();
+
+            if (layer.legendPanel) {
+                layer.legendPanel.expand();
+            }
 
 			// Layer
 			layer.setLayerOpacity(view.opacity);

=== 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-07-15 22:44:46 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js	2015-07-15 22:48:48 +0000
@@ -3221,7 +3221,10 @@
 
 			// Legend
 			gis.viewport.eastRegion.doLayout();
-			layer.legendPanel.expand();
+
+            if (layer.legendPanel) {
+                layer.legendPanel.expand();
+            }
 
 			// Layer
 			if (layer.item) {
@@ -4031,7 +4034,10 @@
 
 			// Legend
 			gis.viewport.eastRegion.doLayout();
-			layer.legendPanel.expand();
+
+            if (layer.legendPanel) {
+                layer.legendPanel.expand();
+            }
 
 			// Layer
 			layer.setLayerOpacity(view.opacity);