diff --git a/UnicodeInformation.Tests/UnicodeInfoTests.cs b/UnicodeInformation.Tests/UnicodeInfoTests.cs
index 36ef968..e6ecb23 100644
--- a/UnicodeInformation.Tests/UnicodeInfoTests.cs
+++ b/UnicodeInformation.Tests/UnicodeInfoTests.cs
@@ -400,6 +400,7 @@ namespace UnicodeInformation.Tests
 
                 Assert.AreEqual(charInfo.Name, UnicodeInfo.GetName(i));
                 Assert.AreEqual(charInfo.Category, UnicodeInfo.GetCategory(i));
+                Assert.AreEqual(UnicodeInfo.GetDisplayText(charInfo), UnicodeInfo.GetDisplayText(i));
             }
         }
 
diff --git a/UnicodeInformation/UnicodeInfo.cs b/UnicodeInformation/UnicodeInfo.cs
index 75d1cfb..564d367 100644
--- a/UnicodeInformation/UnicodeInfo.cs
+++ b/UnicodeInformation/UnicodeInfo.cs
@@ -425,6 +425,7 @@ namespace System.Unicode
 		{
 			if (charInfo.CodePoint <= 0x0020) return ((char)(0x2400 + charInfo.CodePoint)).ToString();
 			else if (charInfo.Category == UnicodeCategory.NonSpacingMark) return "\u25CC" + char.ConvertFromUtf32(charInfo.CodePoint);
+            else if (charInfo.CodePoint >= 0xD800 && charInfo.CodePoint <= 0xDFFF) return "\xFFFD";
 			else return char.ConvertFromUtf32(charInfo.CodePoint);
 		}