Fix without exceptions