Merge "Improve error scenarios SubscriptionEventForwarder"