Index: src/main/java/net/sf/katta/zk/ZkServer.java
===================================================================
--- src/main/java/net/sf/katta/zk/ZkServer.java	(revision 462)
+++ src/main/java/net/sf/katta/zk/ZkServer.java	(working copy)
@@ -90,14 +90,6 @@
         }
         LOG.info("data dir: " + dataDir.getAbsolutePath());
         LOG.info("data log dir: " + dataLogDir.getAbsolutePath());
-
-        // now if required we initialize our namespace
-        final ZKClient client = new ZKClient(conf);
-        client.start(300000);
-        client.createDefaultNameSpace();
-        client.close();
-        // TODO jz: do we initialize the client only for creating the namespaces
-        // ??
       } else {
         // TODO jz: shoudn't we better throw an exception
         LOG.error("Zookeeper port " + port + " was already in use. Running in single machine mode?");
Index: src/main/java/net/sf/katta/master/Master.java
===================================================================
--- src/main/java/net/sf/katta/master/Master.java	(revision 462)
+++ src/main/java/net/sf/katta/master/Master.java	(working copy)
@@ -60,7 +60,11 @@
     _zkClient = zkClient;
     try {
       _zkClient.getEventLock().lock();
-      zkClient.subscribeReconnects(this);
+      // wait until zk client is started
+      _zkClient.start(5000);
+      // now we need to create the default name space
+      _zkClient.createDefaultNameSpace();
+      _zkClient.subscribeReconnects(this);
     } finally {
       _zkClient.getEventLock().unlock();
     }