diff --git a/packet.go b/packet.go
index 2911d02..94a3c31 100644
--- a/packet.go
+++ b/packet.go
@@ -49,11 +49,14 @@ func SendPacket(conn io.Writer, messageType uint16, datafn func(w io.Writer) err
 	if err != nil {
 		return err
 	}
-	binary.Write(conn, binary.LittleEndian, Packet{
+	err = binary.Write(conn, binary.LittleEndian, Packet{
 		Version:     1,
 		MessageType: messageType,
 		DataLength:  uint16(len(data)),
 	})
+	if err != nil {
+		return err
+	}
 	packetsSent.Inc()
 	_, err = conn.Write(data)
 	return err
diff --git a/synced-pool.go b/synced-pool.go
index 77ceaa4..3aa9530 100644
--- a/synced-pool.go
+++ b/synced-pool.go
@@ -382,7 +382,7 @@ func (p *SyncedPool) OwnerChanged(id CartId, host string) error {
 }
 
 func DoPing(host *RemoteHost) error {
-	SendPacket(host.connection, Ping, func(w io.Writer) error {
+	SendPacket(host, Ping, func(w io.Writer) error {
 		return nil
 	})
 	_, err := host.Expect(Pong, time.Second)