diff --git a/nullaway/src/main/java/com/uber/nullaway/NullAway.java b/nullaway/src/main/java/com/uber/nullaway/NullAway.java
index 1a087e3e1a..6bb3f4ab28 100644
--- a/nullaway/src/main/java/com/uber/nullaway/NullAway.java
+++ b/nullaway/src/main/java/com/uber/nullaway/NullAway.java
@@ -507,7 +507,8 @@ public Description matchSwitch(SwitchTree tree, VisitorState state) {
     }
 
     if (mayBeNullExpr(state, switchExpression)) {
-      final String message = "switch expression " + switchExpression.toString() + " is @Nullable";
+      final String message =
+          "switch expression " + state.getSourceForNode(switchExpression) + " is @Nullable";
       ErrorMessage errorMessage =
           new ErrorMessage(MessageTypes.SWITCH_EXPRESSION_NULLABLE, message);