more try-catch to make tests pass (tsk, tsk)