Fix: check for null argument to node-info and attributes