@@ -3,10 +3,15 @@
 var http = require('http');
 
 function IoRequest(socket, io, data, response) {
-  this.socket = socket;
   this.data = data;
+  this.response = response;
+
+  this.socket = socket;
+  this.session = socket.session;
+  this.handshake = socket.handshake;
 
   var req = socket.client.request;
+
   this.sessionID = req.sessionID;
   this.headers = req.headers;
   this.query = req._query;
@@ -17,13 +22,6 @@ function IoRequest(socket, io, data, response) {
     this.user = req.user;
   }
 
-  this.session = socket.session;
-  if (socket.session) {
-    this.handshake = socket.session.handshake;
-  }
-
-  this.response = response;
-
   this.io = {
     route: function(route) {
       return io.route(route, this, this.response);