diff --git a/src/main/java/tsp/headdb/database/HeadDatabase.java b/src/main/java/tsp/headdb/database/HeadDatabase.java
index 1b75f49..d9b6190 100644
--- a/src/main/java/tsp/headdb/database/HeadDatabase.java
+++ b/src/main/java/tsp/headdb/database/HeadDatabase.java
@@ -126,9 +126,11 @@ public class HeadDatabase {
                 JSONArray array = (JSONArray) parser.parse(response.toString());
                 for (Object o : array) {
                     JSONObject obj = (JSONObject) o;
+                    String uuid = obj.get("uuid").toString();
+                    
                     Head head = new Head(id)
                             .withName(obj.get("name").toString())
-                            .withUUID(UUID.fromString(obj.get("uuid").toString()))
+                            .withUUID(uuid.isEmpty() ? UUID.randomUUID() : UUID.fromString(uuid))
                             .withValue(obj.get("value").toString())
                             .withCategory(category);