diff --git a/Lidgren.Network/NetPeer.MessagePools.cs b/Lidgren.Network/NetPeer.MessagePools.cs
index ee1fb37..bf61667 100644
--- a/Lidgren.Network/NetPeer.MessagePools.cs
+++ b/Lidgren.Network/NetPeer.MessagePools.cs
@@ -106,12 +106,23 @@ namespace Lidgren.Network
///
/// Creates a new message for sending and writes the provided string to it
///
- public NetOutgoingMessage CreateMessage(string content)
- {
- var om = CreateMessage(2 + content.Length); // fair guess
- om.Write(content);
- return om;
- }
+ public NetOutgoingMessage CreateMessage(string content)
+ {
+ NetOutgoingMessage om;
+
+ // Since this could be null.
+ if (string.IsNullOrEmpty(content))
+ {
+ om = CreateMessage(1); // One byte for the internal variable-length zero byte.
+ }
+ else
+ {
+ om = CreateMessage(2 + content.Length); // Fair guess.
+ }
+
+ om.Write(content);
+ return om;
+ }
///
/// Creates a new message for sending