diff --git a/Core/WebServer.cpp b/Core/WebServer.cpp
index f5fdf68754..284c1c0333 100644
--- a/Core/WebServer.cpp
+++ b/Core/WebServer.cpp
@@ -163,7 +163,8 @@ static void RegisterDiscHandlers(http::Server *http, std::unordered_map<std::str
 			char *buf = new char[CHUNK_SIZE];
 			for (s64 pos = 0; pos < len; pos += CHUNK_SIZE) {
 				s64 chunklen = std::min(len - pos, (s64)CHUNK_SIZE);
-				fread(buf, chunklen, 1, fp);
+				if (fread(buf, chunklen, 1, fp) != 1)
+					break;
 				request.Out()->Push(buf, chunklen);
 			}
 			fclose(fp);
diff --git a/headless/StubHost.cpp b/headless/StubHost.cpp
index 82698770da..dc3520013e 100644
--- a/headless/StubHost.cpp
+++ b/headless/StubHost.cpp
@@ -71,7 +71,9 @@ void HeadlessHost::SendDebugScreenshot(const u8 *pixbuf, u32 w, u32 h)
 		FILE *bmp = File::OpenCFile(comparisonScreenshot_, "rb");
 		if (bmp)
 		{
-			fread(&header, sizeof(header), 1, bmp);
+			if (fread(&header, sizeof(header), 1, bmp) != 1) {
+				SendOrCollectDebugOutput("Failed to read original screenshot header.\n");
+			}
 			fclose(bmp);
 		}