diff --git a/arm9/source/driveOperations.cpp b/arm9/source/driveOperations.cpp
index 3658034..893d7f1 100644
--- a/arm9/source/driveOperations.cpp
+++ b/arm9/source/driveOperations.cpp
@@ -413,7 +413,6 @@ void nitroUnmount(void) {
 		imgUnmount();
 
 	ownNitroFSMounted = 2;
-	fatUnmount("nitro");
 	nitroMounted = false;
 }
 
diff --git a/arm9/source/nitrofs.c b/arm9/source/nitrofs.c
index 45db91a..d4f04dd 100644
--- a/arm9/source/nitrofs.c
+++ b/arm9/source/nitrofs.c
@@ -68,7 +68,7 @@ u32 fntOffset;   //offset to start of filename table
 u32 fatOffset;   //offset to start of file alloc table
 bool hasLoader;  //single global nds filehandle (is null if not in dldi/fat mode)
 u16 chdirpathid; //default dir path id...
-FILE *ndsFile;
+FILE *ndsFile = NULL;
 off_t ndsFileLastpos; //Used to determine need to fseek or not
 
 devoptab_t nitroFSdevoptab = {
@@ -136,7 +136,10 @@ nitroFSInit(const char *ndsfile)
     char romstr[0x10];
     chdirpathid = NITROROOT;
     ndsFileLastpos = 0;
-    ndsFile = NULL;
+    if(ndsFile != NULL) {
+        fclose(ndsFile);
+        ndsFile = NULL;
+    }
     if (ndsfile != NULL)
     {
         if ((ndsFile = fopen(ndsfile, "rb")))