Index: mackie_control_protocol.cc
===================================================================
--- mackie_control_protocol.cc	(revision 4449)
+++ mackie_control_protocol.cc	(working copy)
@@ -544,10 +544,12 @@
 		
 		// create a RouteSignal for the master route
 		// but only the first time around
+		if (session->route_by_name( "master" ))
+                  {
 		master_route_signal = shared_ptr<RouteSignal>( new RouteSignal( *master_route(), *this, master_strip(), mcu_port() ) );
 		// update strip from route
 		master_route_signal->notify_all();
-		
+                  }
 		// sometimes the jog wheel is a pot
 		surface().blank_jog_ring( mcu_port(), builder );
 		
@@ -657,10 +659,9 @@
 shared_ptr<Route> MackieControlProtocol::master_route()
 {
 	shared_ptr<Route> retval;
-	retval = session->route_by_name( "master" );
-	if ( retval == 0 )
+	if ( !(retval = session->route_by_name( "master" )) )
 	{
-		// TODO search through all routes for one with the master attribute set
+		//TODO Handle this more elegantly.
 	}
 	return retval;
 }