Tweak the try/except structure