fixed unhandled_exception exception
Merge branch 'master' of github.com:downloadam/client