LB-561: Wrong exception handling
* fixed