diff --git a/src/ws/reqrep.go b/src/ws/reqrep.go
index 7a9b05c..5906aad 100644
--- a/src/ws/reqrep.go
+++ b/src/ws/reqrep.go
@@ -52,11 +52,11 @@ func HandleWSRR(c echo.Context, cfg *config.Config) error {
 			case "bootstrap":
 				log.Printf("bootstrap: %s\n", apievent.Hostname)
 				for index, value := range LISTENERS {
-					if index != apievent.Hostname {
+					if index != apievent.Hostname && value.ConnectionPS != nil {
 						err = websocket.Message.Send(value.ConnectionPS, msg)
 						if err != nil {
 							log.Println(err)
-							//gcConnOnError(ws)
+							gcConnOnError(ws)
 						}
 					}
 				}
@@ -71,19 +71,23 @@ func HandleWSRR(c echo.Context, cfg *config.Config) error {
 				}
 
 				for _, value := range LISTENERS {
-					err = websocket.Message.Send(value.ConnectionPS, msg)
-					if err != nil {
-						log.Println(err)
-						//gcConnOnError(ws)
+					if value.ConnectionPS != nil {
+						err = websocket.Message.Send(value.ConnectionPS, msg)
+						if err != nil {
+							log.Println(err)
+							gcConnOnError(ws)
+						}
 					}
 				}
 				log.Printf("ws: Inserted event")
 			case "init":
 				for _, value := range LISTENERS {
-					err = websocket.Message.Send(value.ConnectionPS, msg)
-					if err != nil {
-						log.Println(err)
-						//gcConnOnError(ws)
+					if value.ConnectionPS != nil {
+						err = websocket.Message.Send(value.ConnectionPS, msg)
+						if err != nil {
+							log.Println(err)
+							gcConnOnError(ws)
+						}
 					}
 				}
 			default: