Don't call onError
if errors are thrown in onCompleted
#12174
+137
−67
Merged