Made the converter more robust against NULLed UUIDs