diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java
index 9c30d2c9f7..c6764dcba3 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java
@@ -530,7 +530,7 @@ public class ObjectUtils {
     }
 
     public static Query fromMogo(MogoPoiSearchQuery query ) {
-        if ( query == null ) {
+        if ( query == null || query.getQuery() == null) {
             return null;
         }
         Query psq = new Query(query.getQuery(), "", "");