diff --git a/tools/BreakingChanges/Get-BreakingChangeMetadata.ps1 b/tools/BreakingChanges/Get-BreakingChangeMetadata.ps1
index 087c42cc5e5b..cb5c9b391d47 100644
--- a/tools/BreakingChanges/Get-BreakingChangeMetadata.ps1
+++ b/tools/BreakingChanges/Get-BreakingChangeMetadata.ps1
@@ -358,9 +358,11 @@ Function Get-BreakingChangeOfGeneratedModule
             }
             If (-not $AllBreakingChangeMessages[$CmdletName].ContainsKey($AllParameterSetsName))
             {
-                $AllBreakingChangeMessages[$CmdletName].Add($AllParameterSetsName, @{
-                    "CmdletBreakingChange" = [System.Collections.ArrayList]::New(@($BreakingChangeMessage))
-                })
+                $AllBreakingChangeMessages[$CmdletName].Add($AllParameterSetsName, @{})
+            }
+            If (-not $AllBreakingChangeMessages[$CmdletName][$AllParameterSetsName].ContainsKey("CmdletBreakingChange"))
+            {
+                $AllBreakingChangeMessages[$CmdletName][$AllParameterSetsName]["CmdletBreakingChange"] = [System.Collections.ArrayList]::New(@($BreakingChangeMessage))
             }
             Else {
                 $null = $AllBreakingChangeMessages[$CmdletName][$AllParameterSetsName]["CmdletBreakingChange"].Add($BreakingChangeMessage)
@@ -389,9 +391,11 @@ Function Get-BreakingChangeOfGeneratedModule
             }
             If (-not $AllBreakingChangeMessages[$CmdletName].ContainsKey($AllParameterSetsName))
             {
-                $AllBreakingChangeMessages[$CmdletName].Add($AllParameterSetsName, @{
-                    "ParameterBreakingChange" = $ParameterBreakingChangeMessage
-                })
+                $AllBreakingChangeMessages[$CmdletName].Add($AllParameterSetsName, @{})
+            }
+            If (-not $AllBreakingChangeMessages[$CmdletName][$AllParameterSetsName].ContainsKey("ParameterBreakingChange"))
+            {
+                $AllBreakingChangeMessages[$CmdletName][$AllParameterSetsName]["ParameterBreakingChange"] = [System.Collections.ArrayList]::New(@($ParameterBreakingChangeMessage))
             }
             Else {
                 $null = $AllBreakingChangeMessages[$CmdletName][$AllParameterSetsName]["ParameterBreakingChange"].Add($ParameterBreakingChangeMessage)