Renewed logic for error handling
Merge branch 'master' of github.com:internetee/registry