Fixed a few more errors where messages were being cleared before they could be read.
Merge branch 'master' of https://github.com/iwanfrancis/group-13