Revert error handling fix (it was not broken)