googleapis
diff --git a/‎[refs]‎
Lines changed: 1 addition & 1 deletion b/‎[refs]‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎trunk/gcloud-java-dns/src/main/java/com/google/gcloud/spi/DefaultDnsRpc.java‎
Lines changed: 3 additions & 1 deletion b/‎trunk/gcloud-java-dns/src/main/java/com/google/gcloud/spi/DefaultDnsRpc.java‎
Lines changed: 3 additions & 1 deletion
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a1ec7f46c9e4e53ad185039011f49113de48c53a
+refs/heads/master: 04f354a16a8759af38d3e883b9bb9dcc467744f3
 refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
 refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
 
@@ -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;
         }