Fix onError wrapping some more.