Tighten exception handling