diff --git a/nomadnet/Directory.py b/nomadnet/Directory.py
index 1b9e876..fd8cacb 100644
--- a/nomadnet/Directory.py
+++ b/nomadnet/Directory.py
@@ -90,7 +90,10 @@ def load_from_disk(self):
 
                 entries = {}
                 for e in unpacked_list:
-                        
+
+                    if e[1] == None:
+                        e[1] = "Undefined"
+
                     if len(e) > 3:
                         hosts_node = e[3]
                     else:
@@ -375,4 +378,4 @@ def __init__(self, source_hash, display_name=None, trust_level=UNKNOWN, hosts_no
             self.hosts_node   = hosts_node
             self.identify     = identify_on_connect
         else:
-            raise TypeError("Attempt to add invalid source hash to directory")
\ No newline at end of file
+            raise TypeError("Attempt to add invalid source hash to directory")