diff --git a/source/firm.c b/source/firm.c
index c8f8744..6b07a8d 100755
--- a/source/firm.c
+++ b/source/firm.c
@@ -280,8 +280,8 @@ static inline u32 loadFirm(FirmwareType firmType)
         if(!fileRead(firm, "/luma/firmware.bin") || (((u32)section[2].address >> 8) & 0xFF) != 0x68)
             error("An old unsupported FIRM has been detected.\nCopy firmware.bin in /luma to boot");
 
-        //9.6 O3DS FIRM
-        firmVersion = 0x49;
+        //No assumption regarding FIRM version
+        firmVersion = 0xffffffff;
     }
     else decryptExeFs((u8 *)firm);
 
diff --git a/source/patches.c b/source/patches.c
index e963bf7..c5bddfc 100644
--- a/source/patches.c
+++ b/source/patches.c
@@ -240,7 +240,7 @@ void patchTitleInstallMinVersionCheck(u8 *pos, u32 size)
     
     u8 *off = memsearch(pos, pattern, size, 4);
     
-    off[4] = 0xE0;
+    if(off != NULL) off[4] = 0xE0;
 }
 
 void applyLegacyFirmPatches(u8 *pos, FirmwareType firmType)