diff --git a/nova.sh b/nova.sh
index c84d75f..dfc91fe 100755
--- a/nova.sh
+++ b/nova.sh
@@ -274,17 +274,19 @@ NOVA_CONF_EOF
 fi
 
 if [ "$CMD" == "run" ] || [ "$CMD" == "terminate" ]; then
-    # shutdown instances
-    . $NOVA_DIR/novarc; euca-describe-instances | grep i- | cut -f2 | xargs euca-terminate-instances
-    sleep 2
-    # delete volumes
-    . $NOVA_DIR/novarc; euca-describe-volumes | grep vol- | cut -f2 | xargs -n1 euca-delete-volume
-    sleep 2
+    if [ "$ENABLE_KEYSTONE" == 0 ]; then
+        # shutdown instances
+        . $NOVA_DIR/novarc; euca-describe-instances | grep i- | cut -f2 | xargs euca-terminate-instances
+        sleep 2
+        # delete volumes
+        . $NOVA_DIR/novarc; euca-describe-volumes | grep vol- | cut -f2 | xargs -n1 euca-delete-volume
+        sleep 2
+    fi
 fi
 
 if [ "$CMD" == "run" ] || [ "$CMD" == "clean" ]; then
     screen -S nova -X quit
-    rm *.pid*
+    rm -f *.pid*
 fi
 
 if [ "$CMD" == "scrub" ]; then