diff --git a/Core/FileLoaders/HTTPFileLoader.cpp b/Core/FileLoaders/HTTPFileLoader.cpp
index 9c14f5b9fb..0731c617fb 100644
--- a/Core/FileLoaders/HTTPFileLoader.cpp
+++ b/Core/FileLoaders/HTTPFileLoader.cpp
@@ -27,6 +27,12 @@ HTTPFileLoader::HTTPFileLoader(const std::string &filename)
 
 void HTTPFileLoader::Prepare() {
 	std::call_once(preparedFlag_, [this](){
+		if (!url_.Valid()) {
+			ERROR_LOG(LOADER, "HTTP request failed, invalid URL");
+			latestError_ = "Invalid URL";
+			return;
+		}
+
 		if (!client_.Resolve(url_.Host().c_str(), url_.Port())) {
 			ERROR_LOG(LOADER, "HTTP request failed, unable to resolve: %s port %d", url_.Host().c_str(), url_.Port());
 			latestError_ = "Could not connect (name not resolved)";
diff --git a/UI/RemoteISOScreen.cpp b/UI/RemoteISOScreen.cpp
index 9ba9df4f7d..783ec81f3d 100644
--- a/UI/RemoteISOScreen.cpp
+++ b/UI/RemoteISOScreen.cpp
@@ -204,7 +204,16 @@ static bool LoadGameList(const std::string &host, int port, std::vector<std::str
 		return false;
 	}
 
-	for (const std::string &item : items) {
+	for (std::string item : items) {
+		// Apply some workarounds.
+		if (item.empty())
+			continue;
+
+		if (item[0] != '/')
+			item.insert(0, "/");
+		if (item.back() == '\r')
+			item.pop_back();
+
 		if (!RemoteISOFileSupported(item)) {
 			continue;
 		}