diff --git a/firmware/hw_layer/drivers/can/can_hw.cpp b/firmware/hw_layer/drivers/can/can_hw.cpp
index 88d2bd01c7..c41be0ddc9 100644
--- a/firmware/hw_layer/drivers/can/can_hw.cpp
+++ b/firmware/hw_layer/drivers/can/can_hw.cpp
@@ -134,7 +134,7 @@ public:
 		CANDriver* device = detectCanDevice(m_index);
 
 		if (!device) {
-			warning(CUSTOM_ERR_CAN_CONFIGURATION, "CAN configuration issue");
+			warning(CUSTOM_ERR_CAN_CONFIGURATION, "Read: CAN configuration issue bus=%d", m_index);
 			return;
 		}
 
diff --git a/firmware/hw_layer/drivers/can/can_msg_tx.cpp b/firmware/hw_layer/drivers/can/can_msg_tx.cpp
index 5419d2f1de..3d64d65e3a 100644
--- a/firmware/hw_layer/drivers/can/can_msg_tx.cpp
+++ b/firmware/hw_layer/drivers/can/can_msg_tx.cpp
@@ -51,7 +51,7 @@ CanTxMessage::~CanTxMessage() {
 	auto device = s_devices[busIndex];
 
 	if (!device) {
-		warning(CUSTOM_ERR_CAN_CONFIGURATION, "CAN configuration issue");
+		warning(CUSTOM_ERR_CAN_CONFIGURATION, "Send: CAN configuration issue %d", busIndex);
 		return;
 	}
 
diff --git a/firmware/hw_layer/ports/stm32/stm32_common.cpp b/firmware/hw_layer/ports/stm32/stm32_common.cpp
index 3439e45b19..3126992b44 100644
--- a/firmware/hw_layer/ports/stm32/stm32_common.cpp
+++ b/firmware/hw_layer/ports/stm32/stm32_common.cpp
@@ -787,7 +787,8 @@ CANDriver* detectCanDeviceImpl(brain_pin_e pinRx, brain_pin_e pinTx) {
    if (isValidCan2RxPin(pinRx) && isValidCan2TxPin(pinTx))
       return &CAND2;
 #endif
-   return NULL;
+   firmwareError(OBD_PCM_Processor_Fault, "invalid CAN pins", hwPortname(pinTx));
+   return nullptr;
 }
 
 #endif /* EFI_CAN_SUPPORT */