diff --git a/lib/core/proxy.js b/lib/core/proxy.js
index b6bfb955..9fb31b82 100644
--- a/lib/core/proxy.js
+++ b/lib/core/proxy.js
@@ -3,7 +3,7 @@ const http = require('http');
 const constants = require('../constants.json');
 
 let commList = {};
-let transactions = {}; 
+let transactions = {};
 let receipts = {};
 
 const parseRequest = function(reqBody){
@@ -42,7 +42,7 @@ const parseResponse = function(ipc, resBody){
         commList[receipts[jsonO.id]].blockNumber = jsonO.result.blockNumber;
         commList[receipts[jsonO.id]].gasUsed = jsonO.result.gasUsed;
         commList[receipts[jsonO.id]].status = jsonO.result.status;
-        
+
         if(ipc.connected && !ipc.connecting){
             ipc.request('log', commList[receipts[jsonO.id]]);
         } else {
@@ -109,16 +109,17 @@ exports.serve = function(ipc, host, port, ws){
                 parseResponse(ipc, data.toString().substr(data.indexOf("{")));
             });
         });
-         
+
          proxy.on('proxyReqWs', (proxyReq, req, socket) => {
              var parser = new WsParser(0, false);
              socket.pipe(parser);
              parser.on('frame', function (frame) {
                 parseRequest(frame.data);
              });
-         
+
          });
     }
 
     server.listen(port);
+    return server;
 };