diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/BlameCache.java b/gitiles-servlet/src/main/java/com/google/gitiles/BlameCache.java
index b996048..1b3a2d3 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/BlameCache.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/BlameCache.java
@@ -49,8 +49,14 @@
     Region(BlameResult blame, int start) {
       this.sourcePath = blame.getSourcePath(start);
       RevCommit c = blame.getSourceCommit(start);
-      this.sourceCommit = c.copy();
-      this.sourceAuthor = c.getAuthorIdent();
+      if (c != null) {
+        this.sourceCommit = c.copy();
+        this.sourceAuthor = c.getAuthorIdent();
+      } else {
+        // Unknown source commit due to JGit bug.
+        this.sourceCommit = null;
+        this.sourceAuthor = null;
+      }
       this.count = 1;
     }