Another try/catch added as possible solution for issue #29