diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
index 73ab3cfca..d5b3632ab 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
@@ -472,15 +472,15 @@ public class BakingServiceImpl implements BakingService {
         JSONObject json = new JSONObject();
 
         JSONObject jsonCool = coolIvtTab.query("full_point_code = '" + point_code + "'").uniqueResult(0);
-        if (ObjectUtil.isNotEmpty(jsonCool.getString("container_name"))) {
+        if (ObjectUtil.isNotEmpty(jsonCool)) {
             json.put("container_name", jsonCool.getString("container_name"));
         } else {
             JSONObject jsonHot = hotIvtTab.query("point_code = '" + point_code + "'").uniqueResult(0);
-            if (ObjectUtil.isNotEmpty(jsonHot.getString("container_name"))) {
+            if (ObjectUtil.isNotEmpty(jsonHot)) {
                 json.put("container_name", jsonHot.getString("container_name"));
             } else {
                 JSONObject jsonPoint = pointIvtTab.query("point_code = '" + point_code + "'").uniqueResult(0);
-                if (ObjectUtil.isNotEmpty(jsonPoint.getString("material_code"))) {
+                if (ObjectUtil.isNotEmpty(jsonPoint)) {
                     json.put("container_name", jsonPoint.getString("material_code"));
                 } else {
                     json.put("container_name", "");