LPS-45816 Remove unthrown exceptions