Changed how we process exiting
Only add messages when the server says it is ok