diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index 71eb2159a7..7df4ae49cf 100644
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -860,27 +860,29 @@ MackieControlProtocol::user_b_release (Button &)
 LedState
 MackieControlProtocol::master_fader_touch_press (Mackie::Button &)
 {
-	DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::master_fader_touch_press\n");
+	if (_master_surface && _master_surface->master_fader() != 0) {
+		DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::master_fader_touch_press\n");
 
-	Fader* master_fader = _master_surface->master_fader();
+		Fader* master_fader = _master_surface->master_fader();
 
-	boost::shared_ptr<AutomationControl> ac = master_fader->control ();
-
-	master_fader->set_in_use (true);
-	master_fader->start_touch (transport_sample());
+		boost::shared_ptr<AutomationControl> ac = master_fader->control ();
 
+		master_fader->set_in_use (true);
+		master_fader->start_touch (transport_sample());
+	}
 	return none;
 }
 LedState
 MackieControlProtocol::master_fader_touch_release (Mackie::Button &)
 {
-	DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::master_fader_touch_release\n");
+	if (_master_surface && _master_surface->master_fader() != 0) {
+		DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::master_fader_touch_release\n");
 
-	Fader* master_fader = _master_surface->master_fader();
-
-	master_fader->set_in_use (false);
-	master_fader->stop_touch (transport_sample());
+		Fader* master_fader = _master_surface->master_fader();
 
+		master_fader->set_in_use (false);
+		master_fader->stop_touch (transport_sample());
+	}
 	return none;
 }