diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/SavedataChecker.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/SavedataChecker.cpp
index f0e9ade..c96bd93 100644
--- a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/SavedataChecker.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/SavedataChecker.cpp
@@ -15,6 +15,7 @@
 
 #include <nn/fs/fs_ApiSysSaveData.h>
 #include <nn/fs/fs_ApiSharedExtSaveData.h>
+#include <nn/fs/fs_ResultPrivate.h>
 
 #include "SavedataChecker.h"
 #include "CommonLogger.h"
@@ -431,7 +432,7 @@ nn::Result SharedExtSavedataChecker::CleanUp(bool erase)
         else
         {
             // アーカイブごと削除する
-            if(result <= nn::fs::ResultVerificationFailed())
+            if(result <= nn::fs::ResultVerificationFailed() || result <= nn::fs::ResultDbmFileNotFound())
             {
                 NN_LOG("Mount Error: %x\n", IdArray[i]);
 
diff --git a/branches/1stNUP_for_2ndNUP/sources/build.sh b/branches/1stNUP_for_2ndNUP/sources/build.sh
index 2d04d5a..7549f08 100755
--- a/branches/1stNUP_for_2ndNUP/sources/build.sh
+++ b/branches/1stNUP_for_2ndNUP/sources/build.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+set -u
+set -e
+
 # �o�[�W�����擾
 function getVersion
 {
@@ -10,6 +13,8 @@ function getVersion
 }
 
 # �t���O����
+releaseBuild=false;
+unfixedKeyBuild=false
 for arg in $@
 do
     if [ "$arg" = 'RELEASE' ]; then
@@ -21,11 +26,12 @@ do
     fi
 done
 
-if [ $releaseBuild ] ; then
+OPTION=""
+if [ $releaseBuild == "true" ] ; then
     getVersion
     BUILD_TYPE=release,development
     OPTION="PROD_BUILD=true $VERSION_STR"
-elif [ $unfixedKeyBuild ] ; then
+elif [ $unfixedKeyBuild == "true" ] ; then
     getVersion
     BUILD_TYPE=release,development
     OPTION="UNFIXEDKEY_BUILD=true $VERSION_STR"