diff --git a/public_html/deployment/plugins/rollout/awx/rollout_awx.php b/public_html/deployment/plugins/rollout/awx/rollout_awx.php
index 800a2531d6ede3594efbc7e9feba9ff89b234437..276cca0a4afe122d46175dcb707595fad07066dc 100644
--- a/public_html/deployment/plugins/rollout/awx/rollout_awx.php
+++ b/public_html/deployment/plugins/rollout/awx/rollout_awx.php
@@ -147,16 +147,17 @@ class rollout_awx extends rollout_base {
         $aConfig=$this->getConfig($sPhase);
         
         // ----- Checks:
+        $sCmdChecks='';
         if($aConfig['extravars']){
             $aTmp=json_decode($aConfig['extravars']);
             if (!$aTmp || !count($aTmp) ){
-                $aReturn[]='echo "ERROR: Value in extravars has wrong Syntax - this is no JSON: '.$aConfig['extravars'].'"';                
+                $sCmdChecks.='echo "ERROR: Value in extravars has wrong Syntax - this is no JSON: '.$aConfig['extravars'].'"; exit 1; ';                
             }
             $aConfig['extravars']=json_encode($aTmp);
         }
         
         if(!(int)$aConfig['inventory']){
-            $aReturn[]='echo "ERROR: no inventory was given."; exit 1';
+            $sCmdChecks.='echo "ERROR: no inventory was given."; exit 1; ';
         }
         
         // ----- Send variables having values only
@@ -168,7 +169,7 @@ class rollout_awx extends rollout_base {
         }
 
         $sAuth=($aConfig['user'] ? '--user '.$aConfig['user'].':'.$aConfig['password'] : '');
-        $aReturn[]="curl -f -k -H 'Content-Type: application/json' -XPOST -d '". json_encode($aBodyvars, JSON_PRETTY_PRINT)."' $sAuth ".$aConfig['url']."/job_templates/".$aConfig['jobtemplate']."/launch/";
+        $aReturn[]=$sCmdChecks . "curl -f -k -H 'Content-Type: application/json' -XPOST -d '". json_encode($aBodyvars, JSON_PRETTY_PRINT)."' $sAuth ".$aConfig['url']."/job_templates/".$aConfig['jobtemplate']."/launch/";
         return $aReturn;
     }