Improved try/catch/finally support