Enhance certain error messages