diff -r 96c688ebcde7 -r 8a21eb5bdedc objdictgen/nodelist.py
--- a/objdictgen/nodelist.py	Mon Sep 10 08:04:32 2007 +0200
+++ b/objdictgen/nodelist.py	Mon Sep 10 14:32:07 2007 +0200
@@ -23,7 +23,7 @@
 
 from node import *
 import eds_utils
-import os, shutil
+import os, shutil, types
 
 #-------------------------------------------------------------------------------
 #                          Definition of NodeList Object
@@ -102,11 +102,13 @@
                 result = self.LoadEDS(file)
                 if result != None:
                     return result
-                
+        
+        print "Load Master"
         result = self.LoadMasterNode(netname)
         if result != None:
             return result
             
+        print "Load Slaves"
         result = self.LoadSlaveNodes(netname)
         if result != None:
             return result
@@ -163,9 +165,12 @@
         else:
             masterpath = os.path.join(self.Root, "master.od")
         if os.path.isfile(masterpath):
-            return self.Manager.OpenFileInCurrent(masterpath)
-        else:
-            return self.Manager.CreateNewNode("MasterNode", 0x00, "master", "", "None", "", "heartbeat", ["DS302"])
+            result = self.Manager.OpenFileInCurrent(masterpath)
+        else:
+            result = self.Manager.CreateNewNode("MasterNode", 0x00, "master", "", "None", "", "heartbeat", ["DS302"])
+        if not isinstance(result, types.IntType):
+            return result
+        return None
     
     def SaveMasterNode(self, netname = None):
         if netname: