From 3092e9c5c0f15578e62abc1049f42e2c8145589c Mon Sep 17 00:00:00 2001
From: Shlomi Noach <shlomi-noach@github.com>
Date: Thu, 13 Apr 2017 08:27:42 +0300
Subject: [PATCH] error and nil checks on socket connection

---
 go/logic/server.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/go/logic/server.go b/go/logic/server.go
index 3faeb98..12c26b8 100644
--- a/go/logic/server.go
+++ b/go/logic/server.go
@@ -98,8 +98,13 @@ func (this *Server) Serve() (err error) {
 }
 
 func (this *Server) handleConnection(conn net.Conn) (err error) {
-	defer conn.Close()
+	if conn != nil {
+		defer conn.Close()
+	}
 	command, _, err := bufio.NewReader(conn).ReadLine()
+	if err != nil {
+		return err
+	}
 	return this.onServerCommand(string(command), bufio.NewWriter(conn))
 }