diff --git a/inc/upgrade b/inc/upgrade
index d4d31ef8..33eb2da6 100644
--- a/inc/upgrade
+++ b/inc/upgrade
@@ -37,9 +37,11 @@ function save_mysql_dbs {
         set +o xtrace &&
             source $dir/stackrc &&
             echo ${DATABASE_USER:-root})
+    set +e
     for db in $DATABASES_TO_SAVE; do
         mysqldump -u$database_user -p$mysql_pass $db >$SAVE_DIR/$db.sql.$release
     done
+    set -e
 }
 
 # register a database we should save
diff --git a/projects/60_nova/settings b/projects/60_nova/settings
index 6bd94ce8..79a3176a 100644
--- a/projects/60_nova/settings
+++ b/projects/60_nova/settings
@@ -1,4 +1,4 @@
 if is_service_enabled nova; then
     register_project_for_upgrade nova
-    register_db_to_save nova
+    register_db_to_save nova nova-api nova_cell0 nova_cell1
 fi