add check for uuid not null