fix exception handling

2017-01-27, Surkov Sergey