diff --git a/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp b/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp
index 6ea0c2a25e..3bf8c7a97e 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp
@@ -298,6 +298,11 @@ never_inline s32 savedata_op(PPUThread& ppu, u32 operation, u32 version, vm::cpt
 				return CELL_SAVEDATA_ERROR_CBRESULT;
 			}
 
+			if (!fixedSet->dirName)
+			{
+				return CELL_SAVEDATA_ERROR_PARAM;
+			}
+
 			for (s32 i = 0; i < save_entries.size(); i++)
 			{
 				if (save_entries[i].dirName == fixedSet->dirName.get_ptr())
@@ -309,10 +314,7 @@ never_inline s32 savedata_op(PPUThread& ppu, u32 operation, u32 version, vm::cpt
 
 			if (selected == -1)
 			{
-				if (fixedSet->dirName)
-				{
-					save_entry.dirName = fixedSet->dirName.get_ptr();
-				}
+				save_entry.dirName = fixedSet->dirName.get_ptr();
 			}
 		}
 
diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj
index 4ffb5ab8f4..4e450912fa 100644
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@@ -587,9 +587,6 @@
     <ClInclude Include="stdafx_gui.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="D3D12GSRender.vcxproj">
-      <Project>{fac9b17b-f4b8-4b75-8aeb-c8c7cb92b078}</Project>
-    </ProjectReference>
     <ProjectReference Include="emucore.vcxproj">
       <Project>{c4a10229-4712-4bd2-b63e-50d93c67a038}</Project>
     </ProjectReference>