More fixes for the tree-urls
Fixing issue with nil tree-urls.