added message and domain check