diff --git a/backend/gatewayserver/server.js b/backend/gatewayserver/server.js
index 2934e9ac27404a5b3cc62c239f37f91517c6aa71..49262947e2b983591bbf59f69d5c825403bbc628 100644
--- a/backend/gatewayserver/server.js
+++ b/backend/gatewayserver/server.js
@@ -77,11 +77,13 @@ function sendPointStream(call) {
 
 //Right now it doesnt fix cut off jsons (FIX LATER)
 function sendDataStream(data,call){
-  var list = data.toString().split("\n")
+  var list = data.toString().trim().split("\n")
 
-  for(var i =1; i <list.length-2;i++){
+  for(var i =0; i <list.length;i++){
+    try {
       var response = JSON.parse(list[i]);
       call.write(response["point"]);
+    } catch (e) {}
   }
 }