diff --git a/Common/Net/HTTPClient.cpp b/Common/Net/HTTPClient.cpp
index c6366af826..2888ed5012 100644
--- a/Common/Net/HTTPClient.cpp
+++ b/Common/Net/HTTPClient.cpp
@@ -178,6 +178,7 @@ bool Connection::Connect(int maxTries, double timeout, bool *cancelConnect) {
 
 			selectResult = select(maxfd, nullptr, &fds, nullptr, &tv);
 			if (cancelConnect && *cancelConnect) {
+				WARN_LOG(HTTP, "connect(%d): cancelled (1)", sock);
 				break;
 			}
 		}
@@ -196,6 +197,7 @@ bool Connection::Connect(int maxTries, double timeout, bool *cancelConnect) {
 		}
 
 		if (cancelConnect && *cancelConnect) {
+			WARN_LOG(HTTP, "connect(%d): cancelled (2)", sock);
 			break;
 		}
 
diff --git a/Core/WebServer.cpp b/Core/WebServer.cpp
index 31bed62f26..abb03555b9 100644
--- a/Core/WebServer.cpp
+++ b/Core/WebServer.cpp
@@ -162,6 +162,12 @@ static Path LocalFromRemotePath(const std::string &path) {
 
 static void DiscHandler(const http::ServerRequest &request, const Path &filename) {
 	s64 sz = File::GetFileSize(filename);
+	if (sz == 0) {
+		// Probably failed
+		request.WriteHttpResponseHeader("1.0", 404, -1, "text/plain");
+		request.Out()->Push("File not found.");
+		return;
+	}
 
 	std::string range;
 	if (request.Method() == http::RequestHeader::HEAD) {