revert change in error handling