Added basic support for checking for nonstandard messages