diff --git a/src/video/qnxgf/SDL_gf_input.c b/src/video/qnxgf/SDL_gf_input.c
index 1218ecd7b..7329b7ea0 100644
--- a/src/video/qnxgf/SDL_gf_input.c
+++ b/src/video/qnxgf/SDL_gf_input.c
@@ -1071,6 +1071,7 @@ hiddi_connect_devices()
 
     status = hidd_connect(&hidparams, &connection);
     if (status != EOK) {
+        connection=NULL;
         return -1;
     }
 
@@ -1097,6 +1098,7 @@ hiddi_connect_devices()
     /* Disconnect from HID server */
     status = hidd_disconnect(connection);
     if (status != EOK) {
+        connection=NULL;
         return -1;
     }
 
@@ -1105,6 +1107,7 @@ hiddi_connect_devices()
 
     status = hidd_connect(&hidparams, &connection);
     if (status != EOK) {
+        connection=NULL;
         return -1;
     }
 
@@ -1119,9 +1122,12 @@ hiddi_disconnect_devices()
     hiddi_disable_mouse();
 
     /* Disconnect from HID server */
-    status = hidd_disconnect(connection);
-    if (status != EOK) {
-        return -1;
+    if (connection!=NULL)
+    {
+        status = hidd_disconnect(connection);
+        if (status != EOK) {
+            return -1;
+        }
     }
 }
 
diff --git a/src/video/qnxgf/SDL_qnxgf.c b/src/video/qnxgf/SDL_qnxgf.c
index dbff9869a..adfa703da 100644
--- a/src/video/qnxgf/SDL_qnxgf.c
+++ b/src/video/qnxgf/SDL_qnxgf.c
@@ -251,6 +251,9 @@ qnxgf_create(int devindex)
     }
     device->driverdata = gfdata;
 
+    /* By default GF is not initialized */
+    gfdata->gfinitialized = SDL_FALSE;
+
     /* Try to attach to graphics device driver */
     status =
         gf_dev_attach(&gfdata->gfdev, GF_DEVICE_INDEX(devindex),
@@ -543,9 +546,17 @@ qnxgf_videoinit(_THIS)
 void
 qnxgf_videoquit(_THIS)
 {
+    SDL_VideoData *gfdata = (SDL_VideoData *) _this->driverdata;
     SDL_DisplayData *didata = NULL;
     uint32_t it;
 
+    /* Check if GF was initialized before */
+    if ((gfdata == NULL) || (gfdata->gfinitialized != SDL_TRUE))
+    {
+        /* If not, do not deinitialize */
+        return;
+    }
+
     /* Stop collecting mouse events */
     hiddi_disable_mouse();
     /* Delete GF input devices */