Fix exception / add Support for subscriptions