diff --git a/src/MauiSettings/MauiSettingsGeneric.cs b/src/MauiSettings/MauiSettingsGeneric.cs
index 853d6bb..8dfe192 100644
--- a/src/MauiSettings/MauiSettingsGeneric.cs
+++ b/src/MauiSettings/MauiSettingsGeneric.cs
@@ -286,9 +286,9 @@ public static async Task<Tuple<string, Tuple<object, Type>>> ToSettingsTupleAsyn
         }
         #endregion
 
-        #region MyRegion
+        #region Encryption
 
-        public static Task ExhangeKeyAsync(string? newKey = null, string? oldKey = null)
+        public static Task ExhangeKeyAsync(string newKey, string? oldKey = null)
             => Task.Run(async delegate
             {
                 await LoadSecureSettingsAsync(key: oldKey);
@@ -326,7 +326,7 @@ static void GetClassMeta(object settings, MauiSettingsActions mode, MauiSettings
                     settingsObjectInfo.OrignalSettingsObject = settings;
                     settingsObjectInfo.Info = mInfo;
                     // Handles saving the settings to the Maui.Storage.Preferences
-                    _ = ProcessSettingsInfo(settingsObjectInfo, settingsInfo, mode, target, key: key);
+                    _ = ProcessSettingsInfo(settingsObjectInfo, settingsInfo, mode, target);
                 }
             }
         }
@@ -402,7 +402,7 @@ static void GetExpressionMeta<T>(object settings, Expression<Func<SO, T>> value,
                         OrignalSettingsObject = settings,
                         Info = memberExpression.Member,
 
-                    }, new MauiSettingsInfo(), mode, target, key: null);
+                    }, new MauiSettingsInfo(), mode, target);
                 }
             }
         }
@@ -435,7 +435,7 @@ static async Task GetExpressionMetaAsync<T>(object settings, Expression<Func<SO,
             return new();
         }
 
-        static bool ProcessSettingsInfo(MauiSettingsMemberInfo settingsObjectInfo, MauiSettingsInfo settingsInfo, MauiSettingsActions mode, MauiSettingsTarget target, bool throwOnError = false, string? key = null)
+        static bool ProcessSettingsInfo(MauiSettingsMemberInfo settingsObjectInfo, MauiSettingsInfo settingsInfo, MauiSettingsActions mode, MauiSettingsTarget target, bool throwOnError = false)
         {
             settingsInfo ??= new();
             MauiSettingBaseAttribute? settingBaseAttribute = null;
@@ -506,7 +506,6 @@ List<MauiSettingAttribute> settingBaseAttributes
                     if (throwOnError) throw new NotSupportedException("Encryption is only available on the Async methods and if the property is marked as 'Secure'");
                 }
             }
-
             switch (mode)
             {
                 case MauiSettingsActions.Load:
@@ -605,9 +604,6 @@ List<MauiSettingAttribute> settingBaseAttributes
                     return false;
                 }
                 settingBaseAttribute = settingBaseAttributes?.FirstOrDefault();
-            //}
-            //if (settingsObjectInfo.Info is not null)
-            //{
                 settingsInfo.Name = MauiSettingNameFormater.GetFullSettingName(settingsObjectInfo.OrignalSettingsObject.GetType(), settingsObjectInfo.Info, settingBaseAttribute);
                 settingsInfo.SettingsType = (settingsInfo.SettingsType = MauiSettingsObjectHelper.GetSettingType(settingsObjectInfo.Info));
                 settingsInfo.Default = MauiSettingsObjectHelper.GetDefaultValue(settingBaseAttribute, settingsInfo.SettingsType);
@@ -678,7 +674,6 @@ List<MauiSettingAttribute> settingBaseAttributes
 #endif
                 }
             }
-
             switch (mode)
             {
                 case MauiSettingsActions.Load:
@@ -686,8 +681,10 @@ List<MauiSettingAttribute> settingBaseAttributes
                     {
                         object defaultValue = MauiSettingsObjectHelper.GetDefaultValue(settingBaseAttribute, settingsInfo.SettingsType);
                     }
-                    if (secure && settingsInfo.Encrypt && !string.IsNullOrEmpty(key) && !keepEncrypted)
+                    if (secure && settingsInfo.Encrypt && !keepEncrypted)
                     {
+                        if (string.IsNullOrEmpty(key))
+                            throw new ArgumentNullException(nameof(key));
                         if (settingsInfo.Value is string secureString)
                         {
                             // Decrypt string
@@ -715,8 +712,10 @@ List<MauiSettingAttribute> settingBaseAttributes
                             {
                                 if (settingsInfo.Value is string secureString)
                                 {
-                                    if (settingsInfo.Encrypt && !string.IsNullOrEmpty(key))
+                                    if (settingsInfo.Encrypt)
                                     {
+                                        if (string.IsNullOrEmpty(key))
+                                            throw new ArgumentNullException(nameof(key));
                                         // Encrypt string
                                         string encryptedString = EncryptionManager.EncryptStringToBase64String(secureString, key);
                                         await MauiSettingsHelper.SetSecureSettingsValueAsync(settingsInfo.Name, encryptedString);
@@ -874,8 +873,10 @@ List<MauiSettingAttribute> settingBaseAttributes
                 else if (settingsInfo.SettingsType == typeof(string))
                 {
                     settingsInfo.Value = await MauiSettingsHelper.GetSecureSettingsValueAsync(settingsInfo.Name, settingsInfo.Default as string);
-                    if (settingsInfo.Encrypt && !string.IsNullOrEmpty(key) && !keeyEncrypted)
+                    if (settingsInfo.Encrypt && !keeyEncrypted)
                     {
+                        if (string.IsNullOrEmpty(key))
+                            throw new ArgumentNullException(nameof(key));
                         // Decrypt string
                         string decryptedString = EncryptionManager.DecryptStringFromBase64String(settingsInfo.Value as string, key);
                         settingsInfo.Value = decryptedString;