LPS-46755 prefer non-exception handling logic