Added more msg validation.