Merge "Add some extra exception catching/logging to readxml" into tm-dev