Fixed a bug when on_node is nil - it was crashing.