diff --git a/RetroFE/Source/Control/UserInput.cpp b/RetroFE/Source/Control/UserInput.cpp
index e4de2e0..ed5a1f6 100644
--- a/RetroFE/Source/Control/UserInput.cpp
+++ b/RetroFE/Source/Control/UserInput.cpp
@@ -37,13 +37,14 @@ UserInput::UserInput(Configuration &c)
 
 UserInput::~UserInput()
 {
-    for(std::vector<SDL_Joystick *>::iterator it = joysticks_.begin(); it != joysticks_.end(); it++)
-    {
-        if(*it)
-        {
-            SDL_JoystickClose(*it);
-        }
-    }
+// This code causes an exception when a controller is attached; it's disabled to prevent crashes on exit.
+//    for(std::vector<SDL_Joystick *>::iterator it = joysticks_.begin(); it != joysticks_.end(); it++)
+//    {
+//        if(*it)
+//        {
+//            SDL_JoystickClose(*it);
+//        }
+//    }
 }
 
 bool UserInput::initialize()