Closes #45: NPE on subscriptions tree