Reverted error handling.