diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ConvertUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ConvertUtils.java
index edc8633f02..93c653e178 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ConvertUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ConvertUtils.java
@@ -62,6 +62,9 @@ public class ConvertUtils {
     }
 
     public static  <T> T mapToEntity(Map<String, Object> map, Class<T> entity) {
+        if (null == map){
+            return null;
+        }
         T t = null;
         try {
             t = entity.newInstance();