diff --git a/reactos/drivers/usb/miniport/common/fdo.c b/reactos/drivers/usb/miniport/common/fdo.c
index 0a6c3f690f7..3ccaf633575 100644
--- a/reactos/drivers/usb/miniport/common/fdo.c
+++ b/reactos/drivers/usb/miniport/common/fdo.c
@@ -455,7 +455,7 @@ UsbMpInternalDeviceControlFdo(
 					&DevExt->KeyboardIndicators,
 					sizeof(KEYBOARD_INDICATOR_PARAMETERS));*/
 
-				Irp->IoStatus.Status = STATUS_SUCCESS;
+				Irp->IoStatus.Status = STATUS_NOT_SUPPORTED;
 				break;
 		case IOCTL_KEYBOARD_QUERY_TYPEMATIC:
 			DPRINT("USBMP: IOCTL_KEYBOARD_QUERY_TYPEMATIC\n");
@@ -527,7 +527,7 @@ UsbMpInternalDeviceControlFdo(
 					&IndicatorTranslation,
 					sizeof(LOCAL_KEYBOARD_INDICATOR_TRANSLATION));*/
 
-				Irp->IoStatus.Status = STATUS_SUCCESS;
+				Irp->IoStatus.Status = STATUS_NOT_SUPPORTED;
 				break;
 		case IOCTL_INTERNAL_I8042_HOOK_KEYBOARD:
 			/* Nothing to do here */
diff --git a/reactos/drivers/usb/miniport/common/main.c b/reactos/drivers/usb/miniport/common/main.c
index 186b44d0eb6..b4010312b4d 100644
--- a/reactos/drivers/usb/miniport/common/main.c
+++ b/reactos/drivers/usb/miniport/common/main.c
@@ -322,9 +322,7 @@ IrpStub(
 	{
 		DPRINT1("USBMP: FDO stub for major function 0x%lx\n",
 			IoGetCurrentIrpStackLocation(Irp)->MajorFunction);
-#ifndef NDEBUG
-		DbgBreakPoint();
-#endif
+		ASSERT(FALSE);
 		return ForwardIrpAndForget(DeviceObject, Irp);
 	}
 	else
@@ -334,9 +332,7 @@ IrpStub(
 		 */
 		DPRINT1("USBMP: PDO stub for major function 0x%lx\n",
 			IoGetCurrentIrpStackLocation(Irp)->MajorFunction);
-#ifndef NDEBUG
-		DbgBreakPoint();
-#endif
+		ASSERT(FALSE);
 	}
 
 	Status = Irp->IoStatus.Status;