diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
index bc08aed90f..3ab096b0cb 100644
--- a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
+++ b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
@@ -77,6 +77,7 @@ namespace BizHawk.Client.EmuHawk
 			["C64"] = "C64",
 			["GEN"] = "Genesis",
 			["SMS"] = "Sega Master System",
+			["GG"] = "Sega Game Gear",
 			["PSX"] = "PlayStation",
 			["Jaguar"] = "Jaguar",
 			["Lynx"] = "Lynx",
diff --git a/src/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs b/src/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
index b4e32dc978..133539eb2f 100644
--- a/src/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
+++ b/src/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
@@ -349,6 +349,9 @@ namespace BizHawk.Emulation.Common
 			Option("SMS", "Japan", in sms_jp_21);
 			Option("SMS", "Korea", in sms_kr);
 
+			// GG
+			FirmwareAndOption("914AA165E3D879F060BE77870D345B60CFEB4EDE", 1024, "GG", "Majesco", "GG_majesco.gg", "GG BIOS (USA/Majesco)");
+
 			// PSX
 			// http://forum.fobby.net/index.php?t=msg&goto=2763 [f]
 			// http://www.psxdev.net/forum/viewtopic.php?f=69&t=56 [p]
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs
index eb3d2ced79..79c406657c 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs
@@ -255,7 +255,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
  					"CD_BIOS_EU" => new(system: VSystemID.Raw.GEN, firmware: "CD_BIOS_EU"),
  					"CD_BIOS_JP" => new(system: VSystemID.Raw.GEN, firmware: "CD_BIOS_JP"),
  					"CD_BIOS_US" => new(system: VSystemID.Raw.GEN, firmware: "CD_BIOS_US"),
- 					"GG_BIOS" => new(system: VSystemID.Raw.SMS, firmware: "Japan"),
+					"GG_BIOS" => new(system: VSystemID.Raw.GG, firmware: "Majesco"),
  					"MS_BIOS_EU" => new(system: VSystemID.Raw.SMS, firmware: "Export"),
  					"MS_BIOS_JP" => new(system: VSystemID.Raw.SMS, firmware: "Japan"),
  					"MS_BIOS_US" => new(system: VSystemID.Raw.SMS, firmware: "Export"),
@@ -265,7 +265,12 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 				if (firmwareID != null)
 				{
 					// this path will be the most common PEBKAC error, so be a bit more vocal about the problem
-					srcdata = CoreComm.CoreFileProvider.GetFirmwareOrThrow(firmwareID.Value, "GPGX firmwares are required.");
+					srcdata = CoreComm.CoreFileProvider.GetFirmware(firmwareID.Value, "GPGX firmwares are required.");
+					if (srcdata == null)
+					{
+						Console.WriteLine($"Frontend couldn't satisfy firmware request {firmwareID}");
+						return 0;
+					}
 				}
 				else
 				{