Fixed bug in stop() 

Fixed bug in stop() where error was thrown even when message was present