LPS-40408

Hi Ray,

I rebased and solved the inconsistency with exceptions handling

Thank you.