client endHandle: Included exception control
Merge branch 'master' into routes-at-eventbus