Added checks in messaging