diff --git a/src/PepperDash.Core/WebApi/Presets/WebApiPasscodeClient.cs b/src/PepperDash.Core/WebApi/Presets/WebApiPasscodeClient.cs
index 68bbe362..131430a2 100644
--- a/src/PepperDash.Core/WebApi/Presets/WebApiPasscodeClient.cs
+++ b/src/PepperDash.Core/WebApi/Presets/WebApiPasscodeClient.cs
@@ -107,11 +107,11 @@ namespace PepperDash.Core.WebApi.Presets
 				var user = JsonConvert.DeserializeObject<User>(resp.ContentString);
 				CurrentUser = user;
 				if (handler != null)
-					UserReceived(this, new UserReceivedEventArgs(user, true));
+					handler(this, new UserReceivedEventArgs(user, true));
 			}
 			else
 				if (handler != null)
-					UserReceived(this, new UserReceivedEventArgs(null, false));
+					handler(this, new UserReceivedEventArgs(null, false));
 		}
 
 		/// <summary>
@@ -171,14 +171,14 @@ namespace PepperDash.Core.WebApi.Presets
 
 					J2SMaster.LoadWithJson(preset.Data);
 					if (handler != null)
-						PresetReceived(this, new PresetReceivedEventArgs(preset, true));
+						handler(this, new PresetReceivedEventArgs(preset, true));
 				}
 				else // no existing preset
 				{
 					CurrentPreset = new Preset();
 					LoadDefaultPresetData();
 					if (handler != null)
-						PresetReceived(this, new PresetReceivedEventArgs(null, false));
+						handler(this, new PresetReceivedEventArgs(null, false));
 				}
 			}
 			catch (HttpException e)
diff --git a/src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs b/src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs
index e940c573..2ba33df0 100644
--- a/src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs
+++ b/src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs
@@ -150,7 +150,7 @@ namespace PepperDash.Essentials.Core.Config
                 // Directory exists, first clear any contents
                 var archivedConfigFiles = ConfigReader.GetConfigFiles(archiveDirectoryPath + Global.DirectorySeparator + Global.ConfigFileName + ".bak");
 
-                if (archivedConfigFiles != null || archivedConfigFiles.Length > 0)
+                if (archivedConfigFiles != null && archivedConfigFiles.Length > 0)
                 {
                     Debug.LogMessage(LogEventLevel.Information, "{0} Existing files found in archive folder.  Deleting.", archivedConfigFiles.Length);