Added node checking