diff --git a/CHANGES b/CHANGES
index ff6f25ddd..0d07caded 100644
--- a/CHANGES
+++ b/CHANGES
@@ -23,6 +23,7 @@ Bugfixes:
  - GBA BIOS: Fix ArcTan2 sign in HLE BIOS (fixes mgba.io/i/689)
  - GBA Video: Don't update background scanline params in mode 0 (fixes mgba.io/i/377)
  - Core: Fix crash with rewind if savestates shrink
+ - Test: Fix crash when loading invalid file
 Misc:
  - Qt: Improved HiDPI support
  - Feature: Support ImageMagick 7
diff --git a/src/platform/test/fuzz-main.c b/src/platform/test/fuzz-main.c
index 30b611412..a190717fc 100644
--- a/src/platform/test/fuzz-main.c
+++ b/src/platform/test/fuzz-main.c
@@ -66,6 +66,9 @@ int main(int argc, char** argv) {
 		return 0;
 	}
 	struct mCore* core = mCoreFind(args.fname);
+	if (!core) {
+		return 1;
+	}
 	core->init(core);
 	mCoreInitConfig(core, "fuzz");
 	applyArguments(&args, NULL, &core->config);