Editing: WithoutErrorHandler.php