diff --git a/src/Resources/Resources/ChangeLog.md b/src/Resources/Resources/ChangeLog.md
index 3fa8bb74181c..b2975d6680cb 100644
--- a/src/Resources/Resources/ChangeLog.md
+++ b/src/Resources/Resources/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Added missing check for Set-AzRoleAssignment
 * Added breaking change attribute to `SubscriptionId` parameter of `Get-AzResourceGroupDeploymentOperation`
 * Updated ARM template What-If cmdlets to show "Ignore" resource changes last
 * Fixed secure and array parameter serialization issues for deployment cmdlets [#12773]
diff --git a/src/Resources/Resources/RoleAssignments/SetAzureRoleAssignmentCommand.cs b/src/Resources/Resources/RoleAssignments/SetAzureRoleAssignmentCommand.cs
index c60165391f4c..66ec6ddcd7fa 100644
--- a/src/Resources/Resources/RoleAssignments/SetAzureRoleAssignmentCommand.cs
+++ b/src/Resources/Resources/RoleAssignments/SetAzureRoleAssignmentCommand.cs
@@ -112,8 +112,8 @@ public override void ExecuteCmdlet()
             }
 
             // If ConditionVersion is changed, validate it's in the allowed values
-            var oldConditionVersion = double.Parse(InputObject.ConditionVersion);
-            var newConditionVersion = double.Parse(fetchedRole.ConditionVersion);
+            var oldConditionVersion = double.Parse(InputObject.ConditionVersion ?? "0.0");
+            var newConditionVersion = double.Parse(fetchedRole.ConditionVersion ?? "2.0");
 
             // A condition version can change but currently we don't support downgrading to 1.0
             // we only verify the change if it's a downgrade