diff --git a/continuousintegration/orchestration/create_instance.sh b/continuousintegration/orchestration/create_instance.sh
index ef95427f37d106ddfac2223877de66e3f1c46420..79d61dccfccc54c1d19284a59408c56a3b143adb 100755
--- a/continuousintegration/orchestration/create_instance.sh
+++ b/continuousintegration/orchestration/create_instance.sh
@@ -241,7 +241,7 @@ kubectl	create -f ${poddir}/pod-init.yaml --namespace=${instance}
 echo -n "Waiting for init"
 for ((i=0; i<400; i++)); do
   echo -n "."
-  kubectl get pod init -a --namespace=${instance} | grep -q Completed && break
+  kubectl get pod init -a --namespace=${instance} | egrep -q 'Completed|Error' && break
   sleep 1
 done