diff --git a/server.go b/server.go
index ce51a20..0b6f85c 100644
--- a/server.go
+++ b/server.go
@@ -315,11 +315,11 @@ func main() {
 
         finalData, err := json.Marshal(data)
         if err != nil {
-            log.Fatal(err)
+            log.Print(err)
         }
+
         if _, err := fmt.Fprintf(w, "data: %s\n\n", fmt.Sprintf("%s", finalData)); err != nil {
-          metadataConnPool.DeleteConnection(connection)
-          log.Printf("%s's connection to the metadata stream has been closed\n", r.Host)
+          log.Printf("Error on metadata stream : %s", err)
           return
         }
         w.(http.Flusher).Flush()
@@ -354,7 +354,7 @@ func main() {
         _, err := w.Write([]byte(fmt.Sprintf("data: %d\n\n", connection.numberSent)))
 
         if err != nil {
-          log.Fatal(err)
+          log.Printf("Error on listeners stream : %s", err)
           return
         }
       }