diff --git a/test/testhotplug.c b/test/testhotplug.c
index 00c3d634b..4849a6a73 100644
--- a/test/testhotplug.c
+++ b/test/testhotplug.c
@@ -78,9 +78,13 @@ main(int argc, char *argv[])
                                     haptic = NULL;
                                 }
                             } else {
-                                SDL_Log("Joy haptic FAILED!\n");
+                                SDL_Log("Joy haptic open FAILED!\n");
                             }
                         }
+                        else
+                        {
+                            SDL_Log("No haptic found\n");
+                        }
                     }
                     break;
                 case SDL_JOYDEVICEREMOVED:
@@ -91,6 +95,7 @@ main(int argc, char *argv[])
                         if(haptic)
                         {
                             SDL_HapticClose(haptic);
+                            haptic = NULL;
                         }
                         SDL_JoystickClose(joystick);
                         joystick = NULL;