Modify some functions to return errors
Merge branch 'master' of github.com:jyap808/jaeger