diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorer.cpp
index 50a0bab..bdef00c 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorer.cpp
@@ -18,8 +18,10 @@
 #include "CommonLogger.h"
 #include "HeapManager.h"
 
+#include <nn/fs.h>
 #include <nn/fs/fs_ApiExternalSeeds.h>
 #include <nn/fs/fs_ApiTitleTags.h>
+#include <nn/nim.h>
 #include <nn/nim/CTR/nim_PrepurchaseTitleTag.h>
 #include <nn/nim/CTR/nim_ShopApi.h>
 
@@ -64,6 +66,10 @@ PreorderTitleRestorer::~PreorderTitleRestorer()
 
 nn::Result PreorderTitleRestorer::Execute(nn::ProgramId list[], size_t size, nn::cfg::CTR::CfgCountryCode country, nn::cfg::CTR::CfgRegionCode region)
 {
+    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(
+            nn::nim::InitializeForShop());
+    nn::fs::Initialize();
+
     for(s32 i = 0; i < size; ++i)
     {
         m_Progress = i * 100 / size;
@@ -76,6 +82,9 @@ nn::Result PreorderTitleRestorer::Execute(nn::ProgramId list[], size_t size, nn:
                 SetExternalSeedOrPlayableDate(list[i], deliveredCountry, xml));
     }
 
+    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(
+            nn::nim::FinalizeForShop());
+
     return nn::ResultSuccess();
 }
 
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.cpp
index ff036c1..95cc4ac 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.cpp
@@ -81,7 +81,14 @@ void PreorderTitleRestorerManager::End()
 
 u64 PreorderTitleRestorerManager::GetProgress()
 {
-    return m_Restorer->GetProgress();
+    if(m_Restorer)
+    {
+        return m_Restorer->GetProgress();
+    }
+    else
+    {
+        return 0;
+    }
 }
 
 void PreorderTitleRestorerManager::ThreadFunc()