handle error
Merge branch 'feature/client' into develop