diff --git a/CHANGES b/CHANGES
index c354d982c..31331d246 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,7 @@ Bugfixes:
  - GBA Cheats: Fix GameShark ROM patches
 Misc:
  - PSP2: Improved controller rumble
+ - GB, GBA: Prevent loading null ROMs
 
 0.5.1: (2016-10-05)
 Bugfixes:
diff --git a/src/gb/gb.c b/src/gb/gb.c
index ff7953bfd..ba6a26194 100644
--- a/src/gb/gb.c
+++ b/src/gb/gb.c
@@ -80,6 +80,9 @@ static void GBInit(void* cpu, struct mCPUComponent* component) {
 }
 
 bool GBLoadROM(struct GB* gb, struct VFile* vf) {
+	if (!vf) {
+		return false;
+	}
 	GBUnloadROM(gb);
 	gb->romVf = vf;
 	gb->pristineRomSize = vf->size(vf);
diff --git a/src/gba/gba.c b/src/gba/gba.c
index e0ebad00c..5f95bf158 100644
--- a/src/gba/gba.c
+++ b/src/gba/gba.c
@@ -484,6 +484,9 @@ bool GBALoadMB(struct GBA* gba, struct VFile* vf) {
 }
 
 bool GBALoadROM(struct GBA* gba, struct VFile* vf) {
+	if (!vf) {
+		return false;
+	}
 	GBAUnloadROM(gba);
 	gba->romVf = vf;
 	gba->pristineRomSize = vf->size(vf);