diff --git a/src/kubecontrol/KubePod.cpp b/src/kubecontrol/KubePod.cpp
index c17c205..8d15571 100644
--- a/src/kubecontrol/KubePod.cpp
+++ b/src/kubecontrol/KubePod.cpp
@@ -96,14 +96,21 @@ namespace kubecontrol
             node["spec"]["containers"][0]["env"][i]["value"] = item.second;
         }
 
-        node["spec"]["containers"][0]["args"].SetStyle(YAML::EmitterStyle::Flow);
         
-        for (auto item : Args_) {
-            node["spec"]["containers"][0]["args"].push_back(item);
+        if (Args_.size() > 0) 
+        {
+            node["spec"]["containers"][0]["args"].SetStyle(YAML::EmitterStyle::Flow);
+            for (auto item : Args_) {
+                node["spec"]["containers"][0]["args"].push_back(item);
+            }
         }
 
-        node["spec"]["containers"][0]["command"].SetStyle(YAML::EmitterStyle::Flow);
-        node["spec"]["containers"][0]["command"].push_back(PodCommand_);
+        if (!PodCommand_.empty()) 
+        {
+            
+            node["spec"]["containers"][0]["command"].SetStyle(YAML::EmitterStyle::Flow);
+            node["spec"]["containers"][0]["command"].push_back(PodCommand_);
+        }