diff --git a/ipmd/static/ipmd/js/ipmdlib.js b/ipmd/static/ipmd/js/ipmdlib.js
index eb04428bb1e75c8cc0c98d2662b33818202c99c4..791bc4fe96719e92327a93d6461899510b3cedaf 100644
--- a/ipmd/static/ipmd/js/ipmdlib.js
+++ b/ipmd/static/ipmd/js/ipmdlib.js
@@ -395,7 +395,7 @@ async function initDataSourceMap(containerId, geoJson, countryCodeList, featureC
     }
 
     // If no data, no map
-    if((geoJson == undefined || geoJson == null || geoJson.features.length == 0) && (countryCodeList == null || countryCodeList.length == 0))
+    if((geoJson == undefined || geoJson == null || geoJson.features == undefined || geoJson.features.length == 0) && (countryCodeList == null || countryCodeList.length == 0))
     {
         document.getElementById(containerId).innerHTML = "NO GEODATA PROVIDED BY WEATHER DATA SOURCE";
         return;