Merge "Clean up "bad parameter" error messages in Message handler"