LPS-40420 Add back the empty protection to avoid the massive NumberForma...

...tException