Extremely nice error handling improvement