diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8477cd253a2..d950e93ecf9 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-17  Michael Koch  <konqueror@gmx.de>
+
+	* java/net/URL.java (URL): Handle case when argument is null.
+
 2004-11-17  Michael Koch  <konqueror@gmx.de>
 
 	* java/beans/Beans.java,
diff --git a/libjava/java/net/URL.java b/libjava/java/net/URL.java
index 0817126da10..4353662908a 100644
--- a/libjava/java/net/URL.java
+++ b/libjava/java/net/URL.java
@@ -321,7 +321,7 @@ public final class URL implements Serializable
    */
   public URL(String spec) throws MalformedURLException
   {
-    this((URL) null, spec, (URLStreamHandler) null);
+    this((URL) null, spec != null ? spec : "", (URLStreamHandler) null);
   }
 
   /**