Bug fixing - avoid Illegal argument exception if a  node is not found