diff --git a/ArduCopter/RC_Channel.cpp b/ArduCopter/RC_Channel.cpp
index a0d45b0065..a5ec2d6c10 100644
--- a/ArduCopter/RC_Channel.cpp
+++ b/ArduCopter/RC_Channel.cpp
@@ -93,6 +93,7 @@ void RC_Channel_Copter::init_aux_function(const aux_func_t ch_option, const aux_
     case SAVE_WP:
     case RESETTOARMEDYAW:
     case AUTO:
+    case AUTOTUNE:
         break;
     default:
         RC_Channel::init_aux_function(ch_option, ch_flag);
diff --git a/libraries/RC_Channel/RC_Channel.cpp b/libraries/RC_Channel/RC_Channel.cpp
index 80abef9e71..5fe41c89eb 100644
--- a/libraries/RC_Channel/RC_Channel.cpp
+++ b/libraries/RC_Channel/RC_Channel.cpp
@@ -432,6 +432,9 @@ void RC_Channel::init_aux_function(const aux_func_t ch_option, const aux_switch_
         break;
     default:
         gcs().send_text(MAV_SEVERITY_WARNING, "Failed to initialise RC function (%u)", ch_option);
+#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
+        AP_HAL::panic("Initialisation failed");
+#endif
         break;
     }
 }