more error checking when importing lists and trees
Merge branch 'list-tree-import' into local-refactoring