NullPointer when unsusbscribing fixed