diff --git a/src/FileWrapper.cpp b/src/FileWrapper.cpp
index 78eff28..04ad28f 100644
--- a/src/FileWrapper.cpp
+++ b/src/FileWrapper.cpp
@@ -19,6 +19,7 @@ int FileHandleWrapper_GetSlot() {
         if (!gFileHandleWrapper[i].inUse) {
             gFileHandleWrapper[i].inUse = true;
             res                         = i;
+            break;
         }
     }
     OSMemoryBarrier();
diff --git a/src/main.cpp b/src/main.cpp
index 9c851ea..07b7841 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -52,6 +52,7 @@ INITIALIZE_PLUGIN() {
     memset((void *) &current_launched_title_info, 0, sizeof(current_launched_title_info));
     memset((void *) &gLaunchXML, 0, sizeof(gLaunchXML));
     memset((void *) &gFileInfos, 0, sizeof(gFileInfos));
+    memset((void *) &gFileHandleWrapper, 0, sizeof(gFileHandleWrapper));
     gHomebrewLaunched = FALSE;
     OSInitMutex(&fileWrapperMutex);
     OSInitMutex(&fileinfoMutex);