Fixing issue with message data being nil, which would case a thread to die