Merge "Make an error message more informative"