diff --git a/source/emunand.c b/source/emunand.c
index d748804..c33111f 100644
--- a/source/emunand.c
+++ b/source/emunand.c
@@ -57,7 +57,7 @@ void locateEmuNand(u32 *emuHeader, FirmwareSource *nandType)
             case 2:
                 nandOffset = roundedMinsizes[ISN3DS ? 1 : 0]; //"Minsize" layout
                 break;
-            default:
+            case 0:
                 nandOffset = *nandType == FIRMWARE_EMUNAND ? 0 : (nandSize > 0x200000 ? 0x400000 : 0x200000); //"Legacy" layout
                 break;
         }
diff --git a/source/exceptions.c b/source/exceptions.c
index 86070da..d738e0d 100644
--- a/source/exceptions.c
+++ b/source/exceptions.c
@@ -179,12 +179,11 @@ void detectAndProcessExceptionDumps(void)
         }
     }
 
-    char path[36];
-    char fileName[] = "crash_dump_00000000.dmp";
-    const char *pathFolder = dumpHeader->processor == 9 ? "dumps/arm9" : "dumps/arm11";
+    char path[36] = "dumps/",
+         fileName[] = "crash_dump_00000000.dmp";
 
-    findDumpFile(pathFolder, fileName);
-    memcpy(path, pathFolder, strlen(pathFolder) + 1);
+    concatenateStrings(path, dumpHeader->processor == 9 ? "arm9" : "arm11");
+    findDumpFile(path, fileName);
     concatenateStrings(path, "/");
     concatenateStrings(path, fileName);