CLN: remove nested error handling
The removed code is not covered in the test suite, so this makes for a nice little simplification.  Moreover, since the condition above on 1369-1373 is an ugly one, de-nesting this function will give us a good shot and further simplifying this code.

That said, this could be considered an API change, since now the "errors" kwarg doesn't actually do anything.