diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 91f20e77135..9d5f97ebe1e 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-08  Warren Levy  <warrenl@redhat.com>
+
+	* java/lang/StringBuffer.java (insert(int,char[])): Avoid
+	NullPointerException so proper check of offset can be done.
+
 2000-12-08  Warren Levy  <warrenl@redhat.com>
 
 	* java/io/FileInputStream.java (close): Check if the fd is valid.
diff --git a/libjava/java/lang/StringBuffer.java b/libjava/java/lang/StringBuffer.java
index 6e00fa7eba0..0455ca66c24 100644
--- a/libjava/java/lang/StringBuffer.java
+++ b/libjava/java/lang/StringBuffer.java
@@ -454,7 +454,9 @@ public final class StringBuffer implements Serializable
    */
   public StringBuffer insert (int offset, char[] data)
   {
-    return insert (offset, data, 0, data.length);
+    // One could check if offset is invalid here instead of making sure that
+    // data isn't null before dereferencing, but this works just as well.
+    return insert (offset, data, 0, data == null ? 0 : data.length);
   }
 
   /** Insert the <code>char[]</code> argument into this