LPS-49690 Throwing a more specific error with message
LPS-49690 SF
LPS-48189 Fix simplification
LPS-48189 Test