Fix to Messenger to ensure socket disconnects are heart