diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp
index 0282a639..a58a8247 100644
--- a/Minecraft.Client/Common/Consoles_App.cpp
+++ b/Minecraft.Client/Common/Consoles_App.cpp
@@ -4419,7 +4419,7 @@ int CMinecraftApp::EthernetDisconnectReturned(void *pParam,int iPad,const C4JSto
 		//  4J-PB - turn off the PSN store icon just in case this happened when we were in one of the DLC menus
 #ifdef __ORBIS__
 		sceNpCommerceHidePsStoreIcon();
-#elif defined __PSVITA__
+#elif defined(__PSVITA__) && !defined(DISABLE_PSN)
 		app.GetCommerce()->HidePsStoreIcon();
 #endif
 		app.SetAction(iPad,eAppAction_EthernetDisconnectedReturned_Menus);
diff --git a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp
index 64bc1d67..ac1c4e9b 100644
--- a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp
+++ b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp
@@ -56,7 +56,7 @@ void CPlatformNetworkManagerSony::HandleStateChange(SQRNetworkManager::eSQRNetwo
 		// 4J Stu - We may be accepting an invite from the DLC menu, so hide the icon
 #ifdef __ORBIS__
 		sceNpCommerceHidePsStoreIcon();
-#elif defined __PSVITA__
+#elif defined(__PSVITA__) && !defined(DISABLE_PSN)
 		app.GetCommerce()->HidePsStoreIcon();
 #endif
 		m_bLeavingGame = false;
diff --git a/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
index 6c01f785..45794790 100644
--- a/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
@@ -100,7 +100,7 @@ void UIScene_DLCMainMenu::handleInput(int iPad, int key, bool repeat, bool press
 		{
 #ifdef __ORBIS__
 		sceNpCommerceHidePsStoreIcon();
-#elif defined __PSVITA__
+#elif defined(__PSVITA__) && !defined(DISABLE_PSN)
 		app.GetCommerce()->HidePsStoreIcon();
 #endif
 			navigateBack();
@@ -174,7 +174,7 @@ int UIScene_DLCMainMenu::ExitDLCMainMenu(void *pParam,int iPad,C4JStorage::EMess
 
 #ifdef __ORBIS__
 		sceNpCommerceHidePsStoreIcon();
-#elif defined __PSVITA__
+#elif defined(__PSVITA__) && !defined(DISABLE_PSN)
 		app.GetCommerce()->HidePsStoreIcon();
 #endif
 	pClass->navigateBack();
diff --git a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
index c4cad811..087faada 100644
--- a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
@@ -107,7 +107,7 @@ int UIScene_DLCOffersMenu::ExitDLCOffersMenu(void *pParam,int iPad,C4JStorage::E
 
 #ifdef __ORBIS__
 	sceNpCommerceHidePsStoreIcon();
-#elif defined __PSVITA__
+#elif defined(__PSVITA__) && !defined(DISABLE_PSN)
 	app.GetCommerce()->HidePsStoreIcon();
 #endif
 	ui.NavigateToHomeMenu();//iPad,eUIScene_MainMenu);
diff --git a/Minecraft.Client/PSVita/PSVita_App.cpp b/Minecraft.Client/PSVita/PSVita_App.cpp
index 3bee4de3..e1990801 100644
--- a/Minecraft.Client/PSVita/PSVita_App.cpp
+++ b/Minecraft.Client/PSVita/PSVita_App.cpp
@@ -46,6 +46,7 @@ CConsoleMinecraftApp::CConsoleMinecraftApp() : CMinecraftApp()
 
 	m_pSaveToDelete = NULL;
 	m_pCheckoutProductInfo = NULL;
+	m_pCommerce = NULL;
 }
 
 void CConsoleMinecraftApp::SetRichPresenceContext(int iPad, int contextId)
@@ -1080,7 +1081,7 @@ void CConsoleMinecraftApp::AppEventTick()
 
 bool CConsoleMinecraftApp::CheckForEmptyStore(int iPad)
 {
-#ifdef VITA_COMMERCE
+#ifdef VITA_COMMERCE_ENABLED
 	SonyCommerce::CategoryInfo *pCategories=app.GetCategoryInfo();
 
 	bool bEmptyStore=true;
diff --git a/Minecraft.Client/PSVita/PSVita_Minecraft.cpp b/Minecraft.Client/PSVita/PSVita_Minecraft.cpp
index e4a32956..9c8e9b51 100644
--- a/Minecraft.Client/PSVita/PSVita_Minecraft.cpp
+++ b/Minecraft.Client/PSVita/PSVita_Minecraft.cpp
@@ -665,7 +665,9 @@ int main()
 	app.CommerceInit(); //  MGH - moved this here so GetCommerce isn't NULL
 
 	// 4J-PB - Kick of the check for trial or full version - requires ui to be initialised
+#ifndef DISABLE_PSN
 	app.GetCommerce()->CheckForTrialUpgradeKey();
+#endif