Added a None check to fix streams with optional subscriptions