try catch
Merge branch 'develop' of https://github.com/domwoe/cirql-gateway into develop