diff --git a/src/Automation/Automation/Model/CertificateInfo.cs b/src/Automation/Automation/Model/CertificateInfo.cs
index e69e20b4f02e..9f4176bc4c84 100644
--- a/src/Automation/Automation/Model/CertificateInfo.cs
+++ b/src/Automation/Automation/Model/CertificateInfo.cs
@@ -38,10 +38,8 @@ public CertificateInfo(string resourceGroupName, string accountAcccountName, Azu
             Requires.Argument("certificate", certificate).NotNull();
             this.AutomationAccountName = accountAcccountName;
             this.ResourceGroupName = resourceGroupName;
-            this.Name = certificate.Name;
-
             if (certificate == null) return;
-
+            this.Name = certificate.Name;
             this.Description = certificate.Description;
             this.CreationTime = certificate.CreationTime.ToLocalTime();
             this.LastModifiedTime = certificate.LastModifiedTime.ToLocalTime();
diff --git a/src/Automation/Automation/Model/NodeConfigurationDeployment.cs b/src/Automation/Automation/Model/NodeConfigurationDeployment.cs
index 1074fd4dc776..f6b06a8e2316 100644
--- a/src/Automation/Automation/Model/NodeConfigurationDeployment.cs
+++ b/src/Automation/Automation/Model/NodeConfigurationDeployment.cs
@@ -196,7 +196,7 @@ public NodeConfigurationDeployment(string resourceGroupName, string accountName,
             AutomationAccountName = accountName;
             NodeConfigurationName = nodeConfiguraionName;
 
-            if (automationJob != null && automationJob == null) return;
+            if (automationJob == null) return;
 
             if (automationJob != null)
             {