From b07900766ff4c4ff76f60d9294767394841aa278 Mon Sep 17 00:00:00 2001
From: Ajay <ajay@qlogic.io>
Date: Thu, 3 Jan 2019 19:40:14 -0500
Subject: [PATCH] Fix #4284 fix NPE for getZone

---
 .../src/main/java/com/google/cloud/MetadataConfig.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java
index 5c9550fe8530..723404697095 100644
--- a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java
+++ b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java
@@ -43,7 +43,7 @@ public static String getProjectId() {
 
   public static String getZone() {
     String zoneId = getAttribute("instance/zone");
-    if (zoneId.contains("/")) {
+    if (zoneId != null && zoneId.contains("/")) {
       return zoneId.substring(zoneId.lastIndexOf('/') + 1);
     }
     return zoneId;