[EDIT][#] Added an exception for when a node is found