Now properly handles non-node results