only set UUID when not null, properly send UUID from data-server
Merge pull request #1635 from birarda/packet-sender

fix null UUIDs