Security changes in ParseMessage. Sry for so much commits in short time :<