diff --git a/libraries/MySensors/MyMessage.cpp b/libraries/MySensors/MyMessage.cpp
index ed394b6..89addeb 100644
--- a/libraries/MySensors/MyMessage.cpp
+++ b/libraries/MySensors/MyMessage.cpp
@@ -37,7 +37,8 @@ char* MyMessage::getString(char *buffer) const {
 	uint8_t payloadType = miGetPayloadType();
 
 	if (payloadType == P_STRING) {
-		strcpy(buffer, data);
+		strncpy(buffer, data, miGetLength());
+		buffer[miGetLength()] = '\0';
 		return buffer;
 	} else if (buffer != NULL) {
 		switch(payloadType) {
diff --git a/libraries/MySensors/MySensor.cpp b/libraries/MySensors/MySensor.cpp
index ad342b2..f8a49bd 100644
--- a/libraries/MySensors/MySensor.cpp
+++ b/libraries/MySensors/MySensor.cpp
@@ -269,7 +269,7 @@ boolean MySensor::process() {
 	RF24::read(&msg, len);
 	RF24::writeAckPayload(pipe,&pipe, 1 );
 
-	// Add termination, good for string messages.
+	// Add string termination, good if we later would want to print it.
 	msg.data[mGetLength(msg)] = '\0';
 	debug(PSTR("read: %d-%d-%d s=%d,c=%d,t=%d,pt=%d,l=%d:%s\n"),
 				msg.sender, msg.last, msg.destination,  msg.sensor, mGetCommand(msg), msg.type, mGetPayloadType(msg), mGetLength(msg), msg.getString(convBuf));