Remove hack from ErrorHandlingResultCallback