Exception handlers improvements