diff --git a/embark-ui/src/containers/ProcessesContainer.js b/embark-ui/src/containers/ProcessesContainer.js
index 3f21cddd..c98bc026 100644
--- a/embark-ui/src/containers/ProcessesContainer.js
+++ b/embark-ui/src/containers/ProcessesContainer.js
@@ -20,24 +20,21 @@ class ProcessesContainer extends Component {
       return <Loading />;
     }
 
-    if (processes.error) {
-      return (
-        <h1>
-          <i>Error loading processes: {processes.error.message || processes.error}</i>
-        </h1>
-      );
-    }
-
     const processNames = Object.keys(processes.data);
     return (
       <div className="processes-container">
-        <Tabs initialTab={processNames[0]}>
+        {processes.error && <h1>
+          <i>Error: {processes.error.message || processes.error}</i>
+        </h1>}
+
+        {processNames && processNames.length && <Tabs initialTab={processNames[0]}>
           {processNames.map(processName => {
             return (<Tab key={processName} title={processName}>
               <Process processName={processName} state={processes.data[processName].state}/>
             </Tab>);
           })}
-        </Tabs>
+        </Tabs>}
+
       </div>
     );
   }
diff --git a/lib/modules/swarm/index.js b/lib/modules/swarm/index.js
index 32a5363f..03058617 100644
--- a/lib/modules/swarm/index.js
+++ b/lib/modules/swarm/index.js
@@ -27,6 +27,10 @@ class Swarm {
       return;
     }
 
+    this.events.request('processes:register', 'swarm', (cb) => {
+      self.startProcess(cb);
+    });
+
     this.bzz = new Web3Bzz(this.providerUrl);
 
     this.setServiceCheck();
@@ -89,7 +93,8 @@ class Swarm {
       events: self.events,
       storageConfig: self.storageConfig,
       webServerConfig: self.webServerConfig,
-      blockchainConfig: self.blockchainConfig
+      blockchainConfig: self.blockchainConfig,
+      embark: self.embark
     });
     self.logger.trace(`Storage module: Launching swarm process...`);
     return storageProcessesLauncher.launchProcess('swarm', callback);