Hotfix/service error codes

Fixes #83