From 6cc3e83fe52a23f331cfd24102801f031ac0143c Mon Sep 17 00:00:00 2001
From: Manu Sridharan <msridhar@gmail.com>
Date: Fri, 4 Aug 2023 16:54:31 -0700
Subject: [PATCH] fix NullAway warnings

---
 .../src/main/java/com/uber/nullaway/ErrorBuilder.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nullaway/src/main/java/com/uber/nullaway/ErrorBuilder.java b/nullaway/src/main/java/com/uber/nullaway/ErrorBuilder.java
index 287dfb041c..28ef27c9a7 100755
--- a/nullaway/src/main/java/com/uber/nullaway/ErrorBuilder.java
+++ b/nullaway/src/main/java/com/uber/nullaway/ErrorBuilder.java
@@ -203,8 +203,10 @@ private Description.Builder addSuggestedSuppression(
         if (config.getCastToNonNullMethod() != null && canBeCastToNonNull(suggestTree)) {
           builder = addCastToNonNullFix(suggestTree, builder);
         } else {
-          builder =
-              addSuppressWarningsFix(suppressibleNode(state.getPath()), builder, suppressionName);
+          Tree suppressibleNode = suppressibleNode(state.getPath());
+          if (suppressibleNode != null) {
+            builder = addSuppressWarningsFix(suppressibleNode, builder, suppressionName);
+          }
         }
         break;
       case CAST_TO_NONNULL_ARG_NONNULL:
@@ -343,7 +345,8 @@ private boolean canBeCastToNonNull(Tree tree) {
         // make the parameter @NonNull and add casts at call sites, but that is beyond the scope of
         // our suggested fixes
         Symbol symbol = ASTHelpers.getSymbol(tree);
-        return !(symbol.getKind().equals(ElementKind.PARAMETER)
+        return !(symbol != null
+            && symbol.getKind().equals(ElementKind.PARAMETER)
             && hasNullableAnnotation(symbol, config));
       default:
         return true;