exceptions handling issue fixed