diff --git a/src/add-ons/kernel/bus_managers/usb/BusManager.cpp b/src/add-ons/kernel/bus_managers/usb/BusManager.cpp
index 2360165a2f..d439a2e2db 100644
--- a/src/add-ons/kernel/bus_managers/usb/BusManager.cpp
+++ b/src/add-ons/kernel/bus_managers/usb/BusManager.cpp
@@ -128,7 +128,7 @@ BusManager::AllocateDevice(Hub *parent, usb_speed speed)
 	ControlPipe *defaultPipe = _GetDefaultPipe(speed);
 
 	if (!defaultPipe) {
-		TRACE(("USB BusManager: error getting the default pipe for speed %d\n", (int)speed));
+		TRACE_ERROR(("USB BusManager: error getting the default pipe for speed %d\n", (int)speed));
 		FreeAddress(deviceAddress);
 		return NULL;
 	}
diff --git a/src/add-ons/kernel/bus_managers/usb/Device.cpp b/src/add-ons/kernel/bus_managers/usb/Device.cpp
index d70ec1d09f..8b4eb2de55 100644
--- a/src/add-ons/kernel/bus_managers/usb/Device.cpp
+++ b/src/add-ons/kernel/bus_managers/usb/Device.cpp
@@ -191,7 +191,7 @@ Device::Device(Object *parent, usb_device_descriptor &desc, int8 deviceAddress,
 						* sizeof(usb_descriptor *));
 
 					/* add this descriptor */
-					currentInterface->generic[currentInterface->generic_count] =
+					currentInterface->generic[currentInterface->generic_count - 1] =
 						(usb_descriptor *)genericDescriptor;
 					break;
 			}