diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/AgentCommandsPublisher.java b/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/AgentCommandsPublisher.java
index 27f51150797..a31db1f8481 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/AgentCommandsPublisher.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/AgentCommandsPublisher.java
@@ -109,8 +109,12 @@ public void sendAgentCommand(Multimap<Long, AgentCommand> agentCommands) throws
             if (ac instanceof ExecutionCommand) {
               try {
                 clusterId = Long.valueOf(((ExecutionCommand)ac).getClusterId());
-                if (!clusterDesiredConfigs.containsKey(clusterId)) {
-                  clusterDesiredConfigs.put(clusterId, clusters.getCluster(clusterId).getDesiredConfigs());
+                if (clusterId >= 0) {
+                  if (!clusterDesiredConfigs.containsKey(clusterId)) {
+                    clusterDesiredConfigs.put(clusterId, clusters.getCluster(clusterId).getDesiredConfigs());
+                  }
+                } else {
+                  LOG.warn("The cluster not found or has not been created yet. clusterID={}.", clusterId);
                 }
               } catch (NumberFormatException|AmbariException e) {
                 LOG.error("Exception on sendAgentCommand", e);