master: fixing bug with PubSub: trying to remove subscription when it doesn't exist