--- old/src/java.base/share/classes/sun/util/resources/TimeZoneNamesBundle.java	2018-04-11 09:27:23.866134540 -0700
+++ new/src/java.base/share/classes/sun/util/resources/TimeZoneNamesBundle.java	2018-04-11 09:27:23.636130282 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,15 +79,16 @@
      */
     @Override
     public Object handleGetObject(String key) {
-        String[] contents = (String[]) super.handleGetObject(key);
-        if (Objects.isNull(contents)) {
-            return null;
+        Object val = super.handleGetObject(key);
+        if (val instanceof String[]) {
+            String[] contents = (String[]) val;
+            int clen = contents.length;
+            String[] tmpobj = new String[7];
+            tmpobj[0] = key;
+            System.arraycopy(contents, 0, tmpobj, 1, clen);
+            return tmpobj;
         }
-        int clen = contents.length;
-        String[] tmpobj = new String[7];
-        tmpobj[0] = key;
-        System.arraycopy(contents, 0, tmpobj, 1, clen);
-        return tmpobj;
+        return val;
     }
 
     /**