Rewrite it to not try/catch badly