LPS-46226 Remove unthrown exceptions