diff --git a/lib/upnp.js b/lib/upnp.js
index 2900494..fdb75cb 100644
--- a/lib/upnp.js
+++ b/lib/upnp.js
@@ -31,11 +31,11 @@ if (process.env.NODE_DEBUG && /upnp/.test(process.env.NODE_DEBUG)) {
 function ControlPoint() {
   events.EventEmitter.call(this);
   this.server = dgram.createSocket('udp4');
-  this.server.addMembership(BROADCAST_ADDR);
   var self = this;
   this.server.on('message', function(msg, rinfo) {self.onRequestMessage(msg, rinfo);});
   this._initParsers();
   this.server.bind(SSDP_PORT);
+  this.server.addMembership(BROADCAST_ADDR); //fixed issue #2
 }
 util.inherits(ControlPoint, events.EventEmitter);
 exports.ControlPoint = ControlPoint;
@@ -84,6 +84,7 @@ ControlPoint.prototype._initParsers = function() {
     self.requestParser.onIncoming = function(req) {
 
     };
+    self.requestParser.socket = { }; //fix for issue #3
   }
   if (!self.responseParser) {
     self.responseParser = http.parsers.alloc();