Issue #174: separate exceptions handling