Merge "Improve Checker error messages"