More code coverage on UmlService and some minor tweaks to error
handling.