diff --git a/OpenSim/Region/Framework/Scenes/LinksetData.cs b/OpenSim/Region/Framework/Scenes/LinksetData.cs
index c5607e6eb04..8f8278a7b29 100644
--- a/OpenSim/Region/Framework/Scenes/LinksetData.cs
+++ b/OpenSim/Region/Framework/Scenes/LinksetData.cs
@@ -381,7 +381,10 @@ public string CheckPasswordAndGetValue(string pass)
         // Deep Copy of Current Entry
         public LinksetDataEntry Copy()
         {
-            return new LinksetDataEntry(String.Copy(Value), Password ?? String.Copy(Password));
+            string value = String.IsNullOrEmpty(Value) ? null : string.Copy(Value);
+            string password = String.IsNullOrEmpty(Password) ? null : string.Copy(Password);
+
+            return new LinksetDataEntry(value, password);
         }
 
         /// <summary>