CB-6971 Fix infinite recursion for onReceiveError