Fixing NPE when unsubscribing