diff --git a/vars/volthaStackDeploy.groovy b/vars/volthaStackDeploy.groovy
index e9f1ab7..36f6340 100644
--- a/vars/volthaStackDeploy.groovy
+++ b/vars/volthaStackDeploy.groovy
@@ -298,10 +298,9 @@
     ## Support argument --timeout (?)
     sleep 5
 
-    fi
-
 done
 rm -f \$vsd_log
+exit \$rc
 """)
 
     leave('waitForOnosDeploy')