Fixed nullcheck and delete sitenode warning