Rationalised optional subscriberId handling