googleapis
diff --git a/‎[refs]‎
Lines changed: 1 addition & 1 deletion b/‎[refs]‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎branches/gcs-nio/gcloud-java-dns/src/main/java/com/google/gcloud/spi/DefaultDnsRpc.java‎
Lines changed: 3 additions & 1 deletion b/‎branches/gcs-nio/gcloud-java-dns/src/main/java/com/google/gcloud/spi/DefaultDnsRpc.java‎
Lines changed: 3 additions & 1 deletion
@@ -11,7 +11,7 @@ refs/tags/v0.0.12: 2fd8066e891fb3dfea69b65f6bf6461db79342b9
 refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
 refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
 refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
-refs/heads/gcs-nio: a1ec7f46c9e4e53ad185039011f49113de48c53a
+refs/heads/gcs-nio: 04f354a16a8759af38d3e883b9bb9dcc467744f3
 refs/heads/logging-alpha: db5312bffa7fccac194f6a7feb8cc3066de16aff
 refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
 refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0
 
@@ -162,7 +162,9 @@ public Change getChangeRequest(String zoneName, String changeRequestId, Map<Opti
     } catch (IOException ex) {
       DnsException serviceException = translate(ex);
       if (serviceException.code() == HTTP_NOT_FOUND) {
-        if (serviceException.location().equals("entity.parameters.changeId")) {
+        if ((serviceException.location() != null
+            && serviceException.location().equals("entity.parameters.changeId"))
+            || serviceException.getMessage().contains("parameters.changeId")) {
           // the change id was not found, but the zone exists
           return null;
         }