Minor change in message checking