error handling

lib/peer.js

@@ -173,10 +173,10 @@ Peer.prototype.connect = function(peer, metadata, options) {
     return;
   }
 
-  options = util.extend(options, {
+  options = util.extend({
     metadata: metadata,
     config: this._options.config,
-  });
+  }, options);
   var connection = new DataConnection(this.id, peer, this._socket, options);
   this._attachConnectionListeners(connection);
 

lib/socket.js

@@ -161,7 +161,8 @@ Socket.prototype._handleHTTPErrors = function(message) {
       util.log('XHR stream closed, WebSocket connected.');
       break;
     case 'HTTP-ERROR':
-      this.emit('error', 'Something went wrong.');
+      // this.emit('error', 'Something went wrong.');
+      util.log('XHR ended in error state');
       break;
     default:
       this.emit('message', message);