Adding null check in subscriber for service lookup