Issue #48 exception handing