LPS-46046 Align code because of the new Exception

Hey @akosthurzo 

Can you please check my changes?

Thx!

cc/ @lipusz