Duplicate incoming messages fix

Had issue with receiving duplicate messages.  Appeared to be issue with not being able to receive message_id.   Made minimal changes to correct issue.