Minimal fix for error handling with streaming (#12578)

There are still issues in PushHandler where the wrong resource is used but these should not be as critical. They will be fixed in #12920

Change-Id: Ife8d3694bdb6ee29c5b4adbd8988cc0346c4fe3f