Add additional check in subscribe/subscribed exchange