Merge branch 'hotfix/api-problem-codes'

Close #68
[#69] Detect HTTP request before continuing
Merge branch 'hotfix/69' into develop

Forward port #69