diff --git a/rpcs3/Loader/PSF.cpp b/rpcs3/Loader/PSF.cpp
index 3f9f6ff3d1..4f2592b6d2 100644
--- a/rpcs3/Loader/PSF.cpp
+++ b/rpcs3/Loader/PSF.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "PSF.h"
 
 template<>
@@ -103,7 +103,7 @@ namespace psf
 		registry result;
 
 		// Hack for empty input (TODO)
-		if (!stream)
+		if (!stream || !stream.size())
 		{
 			return result;
 		}
diff --git a/rpcs3/rpcs3qt/save_manager_dialog.cpp b/rpcs3/rpcs3qt/save_manager_dialog.cpp
index 28ba481e96..e33396ae18 100644
--- a/rpcs3/rpcs3qt/save_manager_dialog.cpp
+++ b/rpcs3/rpcs3qt/save_manager_dialog.cpp
@@ -33,7 +33,7 @@ namespace
 		// get the saves matching the supplied prefix
 		for (const auto& entry : fs::dir(base_dir))
 		{
-			if (!entry.is_directory)
+			if (!entry.is_directory || entry.name == "." || entry.name == "..")
 			{
 				continue;
 			}
@@ -43,6 +43,7 @@ namespace
 
 			if (psf.empty())
 			{
+				LOG_ERROR(LOADER, "Failed to load savedata: %s", base_dir + "/" + entry.name);
 				continue;
 			}