LPS-46046 Align code because of the new Exception