Better excaption handling
Merge branch 'master' of github.com:dwsla/ApiGateway