diff --git a/google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java b/google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java
index 6974e72de..16c71dda7 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java
@@ -165,7 +165,7 @@ private ClassInfo(Class<?> srcClass, boolean ignoreCase) {
     // name set has a special comparator to keep null first
     TreeSet<String> nameSet = new TreeSet<String>(new Comparator<String>() {
       public int compare(String s0, String s1) {
-        return s0 == s1 ? 0 : s0 == null ? -1 : s1 == null ? 1 : s0.compareTo(s1);
+        return Objects.equal(s0, s1) ? 0 : s0 == null ? -1 : s1 == null ? 1 : s0.compareTo(s1);
       }
     });
     // iterate over declared fields