diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
index d8a6432..a54b575 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
@@ -743,7 +743,11 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
                 nn::ptm::CTR::InvalidateSystemTime();
 
                 // cfgの本体固有値をcal値で初期化する
-                InitializeHardwareDependentSetting();
+                result = InitializeHardwareDependentSetting();
+                if(result.IsFailure())
+                {
+                    s_RestoreState = FAIL;
+                }
 
                 init = false;
             }
diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
index 35062b4..7ddfc16 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
@@ -651,11 +651,8 @@ nn::Result ImportIvs()
             }
             nn::fs::Unmount(common::NAND_ARCHIVE_NAME);
         }
-        else
-        {
-            return result;
-        }
         common::HeapManager::GetHeap()->Free(enc);
+        NN_UTIL_RETURN_IF_FAILED(result);
     }
     else
     {