protect against null subscription
bug fix