Improve handling of no node errors.