diff --git a/AndroidAccessory/AndroidAccessory.cpp b/AndroidAccessory/AndroidAccessory.cpp
index 2e86a42..d063910 100644
--- a/AndroidAccessory/AndroidAccessory.cpp
+++ b/AndroidAccessory/AndroidAccessory.cpp
@@ -224,8 +224,8 @@
 
         err = usb.getDevDescr(1, 0, 0x12, (char *) devDesc);
         if (err) {
-            Serial.print("\nDevice descriptor cannot be retrieved. Trying again\n");
-            return false;
+            Serial.print("\nDevice descriptor cannot be retrieved. Program Halted\n");
+            while(1);
         }
 
         if (isAccessoryDevice(devDesc)) {
@@ -237,8 +237,6 @@
             switchDevice(1);
         }
     } else if (usb.getUsbTaskState() == USB_DETACHED_SUBSTATE_WAIT_FOR_DEVICE) {
-        if (connected)
-            Serial.println("disconnect");
         connected = false;
     }