Added message check