added further checks to cover missing/non-existant attributes
Merge branch 'master' of https://github.com/StyleASD/team_citadel into messagesystem