diff --git a/xbox360_wireless_controller.cpp b/xbox360_wireless_controller.cpp
index 6b0abfd..837e243 100644
--- a/xbox360_wireless_controller.cpp
+++ b/xbox360_wireless_controller.cpp
@@ -43,7 +43,9 @@ Xbox360WirelessController::Xbox360WirelessController(struct usb_device* dev,
     {
       if (usb_claim_interface(handle, interface) != 0) // FIXME: bInterfaceNumber shouldn't be hardcoded
         {
-          throw std::runtime_error("Xbox360WirelessController: Error couldn't claim the USB interface");
+          std::ostringstream str;
+          str << "Xbox360WirelessController: Error couldn't claim the USB interface " << interface;
+          throw std::runtime_error(str.str());
         }
     }
 }
diff --git a/xboxdrv.cpp b/xboxdrv.cpp
index 8a165bf..9721400 100644
--- a/xboxdrv.cpp
+++ b/xboxdrv.cpp
@@ -124,7 +124,7 @@ void list_controller()
                 {
                   if (xpad_devices[i].type == GAMEPAD_XBOX360_WIRELESS)
                     {
-                      for(int wid = 0; wid < 3; ++wid)
+                      for(int wid = 0; wid < 4; ++wid)
                         {
                           std::cout << boost::format(" %2d |  %2d |   0x%04x |    0x%04x | %s (Port: %s)")
                             % id