--- a/src/joystick/SDL_joystick.c	Sat Oct 05 21:15:55 2013 -0700
+++ b/src/joystick/SDL_joystick.c	Sun Oct 06 13:49:23 2013 -0700
@@ -763,6 +763,11 @@
 /* return the guid for this opened device */
 SDL_JoystickGUID SDL_JoystickGetGUID(SDL_Joystick * joystick)
 {
+    if (!SDL_PrivateJoystickValid(joystick)) {
+        SDL_JoystickGUID emptyGUID;
+        SDL_zero( emptyGUID );
+        return emptyGUID;
+    }
     return SDL_SYS_JoystickGetGUID( joystick );
 }