Merge PR from AWinterman to throw Errors instead of strings