diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 35ee612260e..32e44100a56 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-16  Fernando Nasser  <fnasser@redhat.com>
+
+	* gnu/java/awt/peer/gtk/GtkContainerPeer.java (handleEvent): Check for
+	null Graphics pointer returned by FileDialogPeer.
+
 2003-12-17  Michael Koch  <konqueror@gmx.de>
 
 	* libltdl/stamp-h.in: Removed, not used anymore.
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java
index 5225ccc5f14..8ab37341917 100644
--- a/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java
+++ b/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java
@@ -107,6 +107,11 @@ public class GtkContainerPeer extends GtkComponentPeer
 	  try 
 	    {
 	      Graphics g = getGraphics ();
+
+	      // Some peers like GtkFileDialogPeer are repainted by Gtk itself
+	      if (g == null)
+	        break;
+
 	      g.setClip (((PaintEvent)event).getUpdateRect());
 
 	      if (id == PaintEvent.PAINT)