improve error messages
improve log message, add TODO
Merge branch 'master' of https://github.com/nitrogenjs/service