--- a/SourceCodeManagerUtilities.st	Sun Dec 01 05:23:25 2019 +0100
+++ b/SourceCodeManagerUtilities.st	Tue Dec 03 21:52:29 2019 +0100
@@ -3755,10 +3755,14 @@
                 s notNil ifTrue:[s close].
             ].
 
-            currentVersion := ChangeSet forExistingClass:eachClass withExtensions:false withLooseMethods:true.
-            currentVersion := versionMethodsAndDoitsRejected value:currentVersion.
-            diffs := repositoryVersion diffSetsAgainst:currentVersion .
-            diffSet addDiffSet:diffs.
+            ChangeSet::InvalidChangeChunkError handle:[:ex |
+                Dialog information:(resources stringWithCRs:'Failed to fetch source of %1 (source corrupted).\Class skipped in comparison' with:eachClass name)
+            ] do:[
+                currentVersion := ChangeSet forExistingClass:eachClass withExtensions:false withLooseMethods:true.
+                currentVersion := versionMethodsAndDoitsRejected value:currentVersion.
+                diffs := repositoryVersion diffSetsAgainst:currentVersion .
+                diffSet addDiffSet:diffs.
+            ]
         ].
     ].