SPR-11832 - fixed NPE when unsubscribing from an endpoint that doesn't exist