diff --git a/pkg/nrpe/nrpe.go b/pkg/nrpe/nrpe.go
index dbf92be7..7a0e207b 100644
--- a/pkg/nrpe/nrpe.go
+++ b/pkg/nrpe/nrpe.go
@@ -109,8 +109,8 @@ func BuildPacketV2(packetType, statusCode uint16, statusLine []byte) *Packet {
 func BuildPacketV4(packetType, statusCode uint16, statusLine []byte) *Packet {
 	dataLength := len(statusLine) + 1 // +1 for the final null byte
 	if dataLength > NrpeV4MaxPacketDataLength {
-		statusLine = statusLine[0:NrpeV4MaxPacketDataLength]
-		dataLength = len(statusLine)
+		statusLine = statusLine[0 : NrpeV4MaxPacketDataLength-1]
+		dataLength = NrpeV4MaxPacketDataLength
 	}
 	if dataLength < NrpeV2MaxPacketDataLength {
 		dataLength = NrpeV2MaxPacketDataLength
diff --git a/pkg/snclient/check_swap_io.go b/pkg/snclient/check_swap_io.go
index b427dd62..335cfbf4 100644
--- a/pkg/snclient/check_swap_io.go
+++ b/pkg/snclient/check_swap_io.go
@@ -159,7 +159,7 @@ func (l *CheckSwapIO) addSwapRate(check *CheckData, snc *Agent) {
 	} else {
 		message := "swapOutCounter does not have a last value"
 		log.Debug(message)
-		entry["_error "] = entry["_error"] + " | " + message
+		entry["_error"] = entry["_error"] + " | " + message
 	}
 
 	if err := swapOutCounter.CheckRetention(time.Duration(l.lookback)*time.Second, 0); err != nil {