diff --git a/src/drivers/common/configSys.cpp b/src/drivers/common/configSys.cpp
index d5c9d921..fa10f0e2 100644
--- a/src/drivers/common/configSys.cpp
+++ b/src/drivers/common/configSys.cpp
@@ -608,7 +608,8 @@ Config::_load()
             pos = line.find(" ");
             name = line.substr(0, (pos > eqPos) ? eqPos : pos);
             pos = line.find_first_not_of(" ", eqPos + 1);
-            value = line.substr(pos);
+	    if (pos == std::string::npos) value = "";
+	    else value = line.substr(pos);
 
             // check if the option exists, and if so, set it appropriately
             str_i = _strOptMap.find(name);
diff --git a/src/drivers/sdl/sdl.cpp b/src/drivers/sdl/sdl.cpp
index 6a4f201e..6f27d5bb 100644
--- a/src/drivers/sdl/sdl.cpp
+++ b/src/drivers/sdl/sdl.cpp
@@ -290,7 +290,7 @@ DriverInitialize(FCEUGI *gi)
 static void
 DriverKill()
 {
-    //g_config->save();
+    g_config->save();
 
 #ifndef WIN32
     // XXX soules - capturing all these signals seems pointless