From 43d596ad07c333c875c5f67b1673c054b3cf4250 Mon Sep 17 00:00:00 2001
From: Kane York <rikingcoding@gmail.com>
Date: Wed, 28 Oct 2015 16:07:51 -0700
Subject: [PATCH] handle null clientid in ArgumetnsAsTwoStrings

---
 socketserver/internal/server/handlecore.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/socketserver/internal/server/handlecore.go b/socketserver/internal/server/handlecore.go
index 28b10b7d..9b480cee 100644
--- a/socketserver/internal/server/handlecore.go
+++ b/socketserver/internal/server/handlecore.go
@@ -96,8 +96,6 @@ func SetupServerAndHandle(config *ConfigFile, serveMux *http.ServeMux) {
 }
 
 func ServeWebsocketOrCatbag(w http.ResponseWriter, r *http.Request) {
-	fmt.Println("hi")
-	fmt.Println(r.Header)
 	if r.Header.Get("Connection") == "Upgrade" {
 		conn, err := SocketUpgrader.Upgrade(w, r, nil)
 		if err != nil {
@@ -397,6 +395,10 @@ func (cm *ClientMessage) ArgumentsAsTwoStrings() (string1, string2 string, err e
 			err = ExpectedTwoStrings
 			return
 		}
+		// clientID can be null
+		if ary[1] == nil {
+			return string1, "", nil
+		}
 		string2, ok = ary[1].(string)
 		if !ok {
 			err = ExpectedTwoStrings