Handle trivial error conditions more gracefully