added message check