Merge "Enhancement better error messages."