Added a check before subscription happens