--- a/src/java.base/share/classes/java/net/URL.java	Mon Nov 26 17:35:35 2018 +0100
+++ b/src/java.base/share/classes/java/net/URL.java	Tue Nov 27 11:09:53 2018 +0000
@@ -1421,13 +1421,12 @@
                 // this thread created.
                 handler = handler2;
             }
+
+            // Insert this handler into the hashtable
+            if (handler != null) {
+                handlers.put(protocol, handler);
+            }
         }
-
-        // Insert this handler into the hashtable
-        if (handler != null) {
-            handlers.put(protocol, handler);
-        }
-
         return handler;
     }