diff --git a/build/tools/makegcdfirm/out_gcdfirm.c b/build/tools/makegcdfirm/out_gcdfirm.c
index d5a6ae53..6e33fa88 100644
--- a/build/tools/makegcdfirm/out_gcdfirm.c
+++ b/build/tools/makegcdfirm/out_gcdfirm.c
@@ -602,6 +602,11 @@ static BOOL NandFirm_Command(char * line, int num)
 
     debug_printf2("nandfirm = %s\n", line);
 
+    if ( ! line )
+    {
+        return TRUE;
+    }
+
     // Set NANDFIRM ROM Offset
     if (!Offset)
     {
@@ -632,6 +637,11 @@ static BOOL NorFirm_Command(char * line, int num)
 
     debug_printf2("norfirm = %s\n", line);
 
+    if ( ! line )
+    {
+        return TRUE;
+    }
+
     // Set NORFIRM ROM Offset
     if (!Offset)
     {