Bug 871764: Fix errors causing subscriptions to fail.