Merge branch 'master' into innerDevelop

src/main/java/com/diagbot/util/CoreUtil.java

@@ -789,7 +789,7 @@ public class CoreUtil {
      * @return
      */
     public static Boolean getMapFlag(Map map) {
-        if (map != null && (Boolean) map.get("flag") == true) {
+        if (map != null && map.get("flag") != null && (Boolean) map.get("flag") == true) {
             return true;
         }
         return false;