diff --git a/check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java b/check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java
index b9f63fac4c1..534a30a4a2c 100644
--- a/check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java
+++ b/check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java
@@ -1163,10 +1163,11 @@ public static ClassSymbol enclosingClass(Symbol sym) {
   @Nullable
   public static PackageSymbol enclosingPackage(Symbol sym) {
     Symbol curr = sym;
-    for (; curr != null && curr.owner != null; curr = curr.owner) {
+    while (curr != null) {
       if (curr.getKind().equals(ElementKind.PACKAGE)) {
         return (PackageSymbol) curr;
       }
+      curr = curr.owner;
     }
     return null;
   }