diff --git a/simulation/src/nuevisim.cpp b/simulation/src/nuevisim.cpp
index cacb3c9..7a4d29b 100644
--- a/simulation/src/nuevisim.cpp
+++ b/simulation/src/nuevisim.cpp
@@ -620,5 +620,14 @@ int main(int argc, const char** argv)
 
     parser.ParseCLI(argc, argv);
 
-    return SimRun(args::get(eepromFile), args::get(eepromWrite), args::get(factoryReset));
+    std::string eepromFileName = args::get(eepromFile);
+
+    //Use a default EEPROM file if none is provided.
+    if(eepromFileName.length()==0)
+    {
+        eepromFileName = SDL_GetPrefPath("Vulk Data System", "NuEVI Simulator");
+        eepromFileName += "eeprom.bin";
+    }
+
+    return SimRun(eepromFileName, args::get(eepromWrite), args::get(factoryReset));
 }
diff --git a/simulation/src/simeeprom.cpp b/simulation/src/simeeprom.cpp
index fc58537..5c960ec 100644
--- a/simulation/src/simeeprom.cpp
+++ b/simulation/src/simeeprom.cpp
@@ -109,13 +109,9 @@ int16_t EEPROMClass::setStorage(const char* filename, bool write)
 }
 
 void EEPROMClass::closeStorage() {
-    if(storage==NULL)
+    if(storage!=NULL)
     {
-        return;
+        fclose(storage);
+        storage=NULL;
     }
-
-    printf("Closing EEPROM storage\n");
-
-    fclose(storage);
-    storage=NULL;
 }