removed handle_error