temporary changes
exception catcher, issue #23