diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
index d54c2327be2ab97cf6f58699d8e18b3dbaf042c7..5feb36b60f8712805ea2e474fb736276b2c08b51 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
@@ -101,6 +101,11 @@ public class AlertSender{
             }else if (alert.getAlertType() == AlertType.SMS){
                 retMaps = emailManager.send(getReciversForSMS(users), alert.getTitle(), alert.getContent(),alert.getShowType());
                 alert.setInfo(retMaps);
+            } else {
+                logger.error("AlertType is not defined. code: {}, descp: {}", 
+                    alert.getAlertType().getCode(), 
+                    alert.getAlertType().getDescp());
+                return;
             }
 
             //send flag
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
index c1689c5bec537b99052962214956fafae90bc2dd..8fa4c013c7c5619e9629709e86ed95c819a9d379 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
@@ -499,6 +499,10 @@ public class ExecutorService extends BaseService{
             }
         }
 
+        if ( start == null || end == null) {
+            return 0;
+        }
+
         if(commandType == CommandType.COMPLEMENT_DATA){
             runMode = (runMode == null) ? RunMode.RUN_MODE_SERIAL : runMode;
             if(null != start && null != end && start.before(end)){
@@ -546,9 +550,7 @@ public class ExecutorService extends BaseService{
         }else{
             command.setCommandParam(JSONUtils.toJson(cmdParam));
             return processDao.createCommand(command);
-        }
-
-        return 0;
+        }  
     }
 
     /**
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
index 3519d5c5358390cf481890e1be99075477e4efd7..9dc2f34cc19fc703b0d49a9c840f0a51ec6041c3 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
@@ -35,13 +35,12 @@ public class DateInterval {
 
     @Override
     public boolean equals(Object obj) {
-        try{
-            DateInterval dateInterval = (DateInterval) obj;
-            return startTime.equals(dateInterval.getStartTime()) &&
-                    endTime.equals(dateInterval.getEndTime());
-        }catch (Exception e){
-            return false;
-        }
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DateInterval that = (DateInterval) o;
+        return startTime.equals(that.startTime) &&
+                endTime.equals(that.endTime);
+        
     }
 
     public Date getStartTime() {
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
index afc3c44825be3a878b6dca3daeaccddd0407f9e3..541281f793885b5ab2440a6bf035521817f41d00 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
@@ -119,7 +119,9 @@ public class HadoopUtils implements Closeable {
                                     fsRelatedProps.forEach((key, value) -> configuration.set(key, value));
                                 }else{
                                     logger.error("property:{} can not to be empty, please set!", Constants.FS_DEFAULTFS );
-                                    throw new RuntimeException("property:{} can not to be empty, please set!");
+                                    throw new RuntimeException(
+                                        String.format("property: %s can not to be empty, please set!", Constants.FS_DEFAULTFS)
+                                        );
                                 }
                             }else{
                                 logger.info("get property:{} -> {}, from core-site.xml hdfs-site.xml ", Constants.FS_DEFAULTFS, defaultFS);
@@ -219,10 +221,12 @@ public class HadoopUtils implements Closeable {
             return null;
         }
 
-        FSDataInputStream in = fs.open(new Path(hdfsFilePath));
-        BufferedReader br = new BufferedReader(new InputStreamReader(in));
-        Stream<String> stream = br.lines().skip(skipLineNums).limit(limit);
-        return stream.collect(Collectors.toList());
+        try (FSDataInputStream in = fs.open(new Path(hdfsFilePath))){
+            BufferedReader br = new BufferedReader(new InputStreamReader(in));
+            Stream<String> stream = br.lines().skip(skipLineNums).limit(limit);
+            return stream.collect(Collectors.toList());
+        }
+        
     }
 
     /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java
index 26d0f1e8e211322c1881fda6d043757a10f83885..ac38ddd2e856247d6ea0b8e3a26d201e1cd40ac7 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java
@@ -96,7 +96,13 @@ public class DagHelper {
             for (String startNodeName : startNodeList) {
                 TaskNode startNode = findNodeByName(taskNodeList, startNodeName);
                 List<TaskNode> childNodeList = new ArrayList<>();
-                if (TaskDependType.TASK_POST == taskDependType) {
+                if (startNode == null) {
+                    logger.error("start node name [{}] is not in task node list [{}] ",
+                        startNodeName,
+                        taskNodeList
+                    );
+                    continue;
+                } else if (TaskDependType.TASK_POST == taskDependType) {
                     childNodeList = getFlowNodeListPost(startNode, taskNodeList);
                 } else if (TaskDependType.TASK_PRE == taskDependType) {
                     childNodeList = getFlowNodeListPre(startNode, recoveryNodeNameList, taskNodeList);
@@ -129,7 +135,6 @@ public class DagHelper {
             if (null != depList && null != startNode && depList.contains(startNode.getName())) {
                 resultList.addAll(getFlowNodeListPost(taskNode, taskNodeList));
             }
-
         }
         resultList.add(startNode);
         return resultList;