Merge "Benchmark: Fix handling of onError"