fix null UUIDs

-closes #1634