LPS-43189 - fix uuid null issue