diff --git a/firmware/console/binary/tooth_logger.cpp b/firmware/console/binary/tooth_logger.cpp
index 0bcb8988dc..f210679180 100644
--- a/firmware/console/binary/tooth_logger.cpp
+++ b/firmware/console/binary/tooth_logger.cpp
@@ -71,7 +71,8 @@ int copyCompositeEvents(CompositeEvent *events) {
 #endif // EFI_UNIT_TEST
 
 static void setToothLogReady(bool value) {
-#if EFI_TUNER_STUDIO
+#if EFI_TUNER_STUDIO && (EFI_PROD_CODE || EFI_SIMULATOR)
+	efiAssertVoid(OBD_PCM_Processor_Fault, engine != nullptr, "engine null");
 	engine->outputChannels.toothLogReady = value;
 #endif // EFI_TUNER_STUDIO
 }
diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp
index fd58703f6c..29ce783556 100644
--- a/firmware/controllers/actuators/electronic_throttle.cpp
+++ b/firmware/controllers/actuators/electronic_throttle.cpp
@@ -265,7 +265,8 @@ expected<percent_t> EtbController::getSetpoint() {
 expected<percent_t> EtbController::getSetpointIdleValve() const {
 	// VW ETB idle mode uses an ETB only for idle (a mini-ETB sets the lower stop, and a normal cable
 	// can pull the throttle up off the stop.), so we directly control the throttle with the idle position.
-#if EFI_TUNER_STUDIO
+#if EFI_TUNER_STUDIO && (EFI_PROD_CODE || EFI_SIMULATOR)
+	efiAssert(OBD_PCM_Processor_Fault, engine != nullptr, "engine null", 0);
 	engine->outputChannels.etbTarget = m_idlePosition;
 #endif // EFI_TUNER_STUDIO
 	return clampF(0, m_idlePosition, 100);