GDS-1296
Fixed exception during unsubscription
GDS-1299