1 files changed, 3 insertions, 2 deletions
diff --git a/java/com/google/gerrit/server/git/RepoRefCache.java b/java/com/google/gerrit/server/git/RepoRefCache.java
index c813b8375b..4fa33118f5 100644
--- a/java/com/google/gerrit/server/git/RepoRefCache.java
+++ b/java/com/google/gerrit/server/git/RepoRefCache.java
@@ -136,8 +136,9 @@ public class RepoRefCache implements RefCache {
     }
 
     try {
-      ObjectId diskId = refdb.exactRef(refName).getObjectId();
-      boolean isStale = !Optional.ofNullable(diskId).equals(id);
+      Optional<ObjectId> diskId =
+          Optional.ofNullable(refdb.exactRef(refName)).map(Ref::getObjectId);
+      boolean isStale = !diskId.equals(id);
       if (isStale) {
         log.atSevere().log(
             "Repository "