Added (extra) safety to the UUID usage

Thank you @sgtcaze :3