Fixed some other issues and added very basic error handling to manager
Merge branch 'master' of github.com:gabrielfarah/OpenHub