fixed up a bunch of error handling
Merge branch 'master' of https://github.com/Alfresco/ThunderOps