diff --git a/tools/StaticAnalysis/Exceptions/Az.Compute/BreakingChangeIssues.csv b/tools/StaticAnalysis/Exceptions/Az.Compute/BreakingChangeIssues.csv
index 2450807e792f..a937ec542d6f 100644
--- a/tools/StaticAnalysis/Exceptions/Az.Compute/BreakingChangeIssues.csv
+++ b/tools/StaticAnalysis/Exceptions/Az.Compute/BreakingChangeIssues.csv
@@ -22,3 +22,7 @@
 "Az.Compute","Get-AzVmssVMRunCommand","Get-AzVmssVMRunCommand","0","1050","The parameter set 'GetViaIdentity' for cmdlet 'Get-AzVmssVMRunCommand' has been removed.","Add parameter set 'GetViaIdentity' back to cmdlet 'Get-AzVmssVMRunCommand'."
 "Az.Compute","Get-AzVmssVMRunCommand","Get-AzVmssVMRunCommand","0","1050","The parameter set '__AllParameterSets' for cmdlet 'Get-AzVmssVMRunCommand' has been removed.","Add parameter set '__AllParameterSets' back to cmdlet 'Get-AzVmssVMRunCommand'."
 "Az.Compute","Get-AzVmssVMRunCommand","Get-AzVmssVMRunCommand","0","1000","The cmdlet 'Get-AzVmssVMRunCommand' has been removed and no alias was found for the original cmdlet name.","Add the cmdlet 'Get-AzVmssVMRunCommand' back to the module, or add an alias to the original cmdlet name."
+"Az.Compute","Microsoft.Azure.Commands.Compute.Automation.GetAzureRmGalleryImageVersion","Get-AzGalleryImageVersion","0","3000","The type of property 'Source' of type 'Microsoft.Azure.Management.Compute.Models.GalleryImageVersionStorageProfile' has changed from 'Microsoft.Azure.Management.Compute.Models.GalleryArtifactVersionSource' to 'Microsoft.Azure.Management.Compute.Models.GalleryArtifactVersionFullSource'.","Change the type of property 'Source' back to 'Microsoft.Azure.Management.Compute.Models.GalleryArtifactVersionSource'."
+"Az.Compute","Microsoft.Azure.Commands.Compute.Automation.GetAzureRmGalleryImageVersion","Get-AzGalleryImageVersion","0","3000","The type of property 'Source' of type 'Microsoft.Azure.Management.Compute.Models.GalleryOSDiskImage' has changed from 'Microsoft.Azure.Management.Compute.Models.GalleryArtifactVersionSource' to 'Microsoft.Azure.Management.Compute.Models.GalleryDiskImageSource'.","Change the type of property 'Source' back to 'Microsoft.Azure.Management.Compute.Models.GalleryArtifactVersionSource'."
+"Az.Compute","Microsoft.Azure.Commands.Compute.Automation.GetAzureRmGalleryImageVersion","Get-AzGalleryImageVersion","0","3000","The type of property 'Source' of type 'Microsoft.Azure.Management.Compute.Models.GalleryDataDiskImage' has changed from 'Microsoft.Azure.Management.Compute.Models.GalleryArtifactVersionSource' to 'Microsoft.Azure.Management.Compute.Models.GalleryDiskImageSource'.","Change the type of property 'Source' back to 'Microsoft.Azure.Management.Compute.Models.GalleryArtifactVersionSource'."
+"Az.Compute","Microsoft.Azure.Commands.Compute.Automation.NewAzureRmGalleryImageVersion","New-AzGalleryImageVersion","0","3000","The type of property 'Source' of type 'Microsoft.Azure.Management.Compute.Models.GalleryOSDiskImage' has changed from 'Microsoft.Azure.Management.Compute.Models.GalleryArtifactVersionSource' to 'Microsoft.Azure.Management.Compute.Models.GalleryDiskImageSource'.","Change the type of property 'Source' back to 'Microsoft.Azure.Management.Compute.Models.GalleryArtifactVersionSource'."
diff --git a/tools/StaticAnalysis/Exceptions/Az.Storage/BreakingChangeIssues.csv b/tools/StaticAnalysis/Exceptions/Az.Storage/BreakingChangeIssues.csv
index db413ff737bd..b1bf53cda39d 100644
--- a/tools/StaticAnalysis/Exceptions/Az.Storage/BreakingChangeIssues.csv
+++ b/tools/StaticAnalysis/Exceptions/Az.Storage/BreakingChangeIssues.csv
@@ -1,5 +1,4 @@
- "Module","ClassName","Target","Severity","ProblemId","Description","Remediation"
-  "Az.Storage","Microsoft.WindowsAzure.Commands.Storage.Blob.Cmdlet.CopyAzureStorageBlob","Copy-AzStorageBlob","0","2090","The ValidateNotNullOrEmpty attribute has been added to parameter 'StandardBlobTier' for cmdlet 'Copy-AzStorageBlob'.","Remove the ValidateNotNullOrEmpty attribute from parameter 'StandardBlobTier'."
-  "Az.Storage","Microsoft.WindowsAzure.Commands.Storage.Blob.SetAzureBlobContentCommand","Set-AzStorageBlobContent","0","2090","The ValidateNotNullOrEmpty attribute has been added to parameter 'StandardBlobTier' for cmdlet 'Set-AzStorageBlobContent'.","Remove the ValidateNotNullOrEmpty attribute from parameter 'StandardBlobTier'."
-  "Az.Storage","Microsoft.WindowsAzure.Commands.Storage.Blob.Cmdlet.StartAzureStorageBlobCopy","Start-AzStorageBlobCopy","0","2090","The ValidateNotNullOrEmpty attribute has been added to parameter 'StandardBlobTier' for cmdlet 'Start-AzStorageBlobCopy'.","Remove the ValidateNotNullOrEmpty attribute from parameter 'StandardBlobTier'."
-  
\ No newline at end of file
+"Module","ClassName","Target","Severity","ProblemId","Description","Remediation"
+"Az.Storage","Microsoft.WindowsAzure.Commands.Storage.Blob.Cmdlet.CopyAzureStorageBlob","Copy-AzStorageBlob","0","2090","The ValidateNotNullOrEmpty attribute has been added to parameter 'StandardBlobTier' for cmdlet 'Copy-AzStorageBlob'.","Remove the ValidateNotNullOrEmpty attribute from parameter 'StandardBlobTier'."
+"Az.Storage","Microsoft.WindowsAzure.Commands.Storage.Blob.SetAzureBlobContentCommand","Set-AzStorageBlobContent","0","2090","The ValidateNotNullOrEmpty attribute has been added to parameter 'StandardBlobTier' for cmdlet 'Set-AzStorageBlobContent'.","Remove the ValidateNotNullOrEmpty attribute from parameter 'StandardBlobTier'."
+"Az.Storage","Microsoft.WindowsAzure.Commands.Storage.Blob.Cmdlet.StartAzureStorageBlobCopy","Start-AzStorageBlobCopy","0","2090","The ValidateNotNullOrEmpty attribute has been added to parameter 'StandardBlobTier' for cmdlet 'Start-AzStorageBlobCopy'.","Remove the ValidateNotNullOrEmpty attribute from parameter 'StandardBlobTier'."
diff --git a/tools/Tools.Common/Loggers/ReportLogger.cs b/tools/Tools.Common/Loggers/ReportLogger.cs
index 402d39213bdb..8a67ce62e3e7 100644
--- a/tools/Tools.Common/Loggers/ReportLogger.cs
+++ b/tools/Tools.Common/Loggers/ReportLogger.cs
@@ -82,8 +82,13 @@ public ReportLogger(string fileName, string exceptionsFileName, AnalysisLogger l
                 var records = File.ReadAllLines(exceptionsFileName);
                 for (int i = 1; i < records.Length; ++i)
                 {
+                    string recordContent = records[i].Trim();
+                    if (recordContent == "")
+                    {
+                        continue;
+                    }
                     var record = new T();
-                    _exceptionRecords.Add(record.Parse(records[i]) as T);
+                    _exceptionRecords.Add(record.Parse(recordContent) as T);
                 }
             }
         }