@@ -169,7 +169,7 @@ euca-terminate-instances $INSTANCE || \

 # case changed with bug/836978. Requesting the status of an invalid instance

 # will now return an error message including the instance id, so we need to

 # filter that out.

-if ! timeout $TERMINATE_TIMEOUT sh -c "while euca-describe-instances $INSTANCE |grep -v \"InstanceNotFound\" | grep -q $INSTANCE; do sleep 1; done"; then

+if ! timeout $TERMINATE_TIMEOUT sh -c "while euca-describe-instances $INSTANCE | grep -ve \"\\\(InstanceNotFound\\\|InvalidInstanceId\[.\]NotFound\\\)\" | grep -q $INSTANCE; do sleep 1; done"; then

     echo "server didn't terminate within $TERMINATE_TIMEOUT seconds"

     exit 1

 fi