delta fixes for handling invalid arguments with message handling.