Fix TFS #1071479 by using ToString instead of Value<string>
Fix TFS #1071570 by using String.IsNullOrEmpty instead of ==null