diff --git a/BTD.cpp b/BTD.cpp
index b3b41a7f..05ef4901 100755
--- a/BTD.cpp
+++ b/BTD.cpp
@@ -589,16 +589,25 @@ void BTD::HCI_event_task() {
                                 break;
 
                         case EV_AUTHENTICATION_COMPLETE:
-                                if(pairWithWii && !connectToWii) {
+                                if(!hcibuf[2]) { // Check if paring was successful
+                                        if(pairWithWii && !connectToWii) {
 #ifdef DEBUG_USB_HOST
-                                        Notify(PSTR("\r\nPairing successful with Wiimote"), 0x80);
+                                                Notify(PSTR("\r\nPairing successful with Wiimote"), 0x80);
 #endif
-                                        connectToWii = true; // Used to indicate to the Wii service, that it should connect to this device
-                                } else if(pairWithHIDDevice && !connectToHIDDevice) {
+                                                connectToWii = true; // Used to indicate to the Wii service, that it should connect to this device
+                                        } else if(pairWithHIDDevice && !connectToHIDDevice) {
 #ifdef DEBUG_USB_HOST
-                                        Notify(PSTR("\r\nPairing successful with HID device"), 0x80);
+                                                Notify(PSTR("\r\nPairing successful with HID device"), 0x80);
 #endif
-                                        connectToHIDDevice = true; // Used to indicate to the BTHID service, that it should connect to this device
+                                                connectToHIDDevice = true; // Used to indicate to the BTHID service, that it should connect to this device
+                                        }
+                                } else {
+#ifdef DEBUG_USB_HOST
+                                        Notify(PSTR("\r\nParing Failed: "), 0x80);
+                                        D_PrintHex<uint8_t > (hcibuf[2], 0x80);
+#endif
+                                        hci_disconnect(hci_handle);
+                                        hci_state = HCI_DISCONNECT_STATE;
                                 }
                                 break;
                                 /* We will just ignore the following events */