Merge pull request #4615 from alexanderkyte/string_error_handling