diff --git a/mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialPasswordDecryptorDecorator.cs b/mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialPasswordDecryptorDecorator.cs
index 99b7acffa..7661208ca 100644
--- a/mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialPasswordDecryptorDecorator.cs
+++ b/mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialPasswordDecryptorDecorator.cs
@@ -27,6 +27,7 @@ namespace mRemoteNG.Config.Serializers.CredentialSerializer
 
         private string DecryptPasswords(string xml, SecureString key)
         {
+            if (string.IsNullOrEmpty(xml)) return xml;
             var xdoc = XDocument.Parse(xml);
             var cryptoProvider = new CryptoProviderFactoryFromXml(xdoc.Root).Build();
             foreach (var credentialElement in xdoc.Descendants())
diff --git a/mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialRecordDeserializer.cs b/mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialRecordDeserializer.cs
index a90f23565..7a7fe0d9a 100644
--- a/mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialRecordDeserializer.cs
+++ b/mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialRecordDeserializer.cs
@@ -13,6 +13,7 @@ namespace mRemoteNG.Config.Serializers.CredentialSerializer
 
         public IEnumerable<ICredentialRecord> Deserialize(string xml)
         {
+            if (string.IsNullOrEmpty(xml)) return new ICredentialRecord[0];
             var xdoc = XDocument.Parse(xml);
             var rootElement = xdoc.Root;
             ValidateSchemaVersion(rootElement);