Added back in slave search for handler logic that couldn't compile in free mode.
Added error handling in case the slave dies midmessage.