diff --git a/src/swarm.js b/src/swarm.js
index 2949c11e..099917b4 100644
--- a/src/swarm.js
+++ b/src/swarm.js
@@ -28,7 +28,9 @@ function Swarm (peerInfo) {
 
   self.protocols = {}
 
-  self.muxer
+  // muxerName: { muxer: muxer
+  //              options: options }
+  self.muxers = {}
 
   // public interface
 
diff --git a/tests/swarm-test.js b/tests/swarm-test.js
index 129a716f..a5a13ea0 100644
--- a/tests/swarm-test.js
+++ b/tests/swarm-test.js
@@ -18,6 +18,11 @@ experiment('Basics', function () {
 })
 */
 
+// because of Travis-CI
+process.on('uncaughtException', function (err) {
+  console.log('Caught exception: ' + err)
+})
+
 experiment('Without a Stream Muxer', function () {
   experiment('tcp', function () {
     test('add the transport', function (done) {