diff --git a/ChangeLog b/ChangeLog
index 2bbf995e36..61812ea21f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-05  Michael Natterer  <mitch@gimp.org>
+
+	* tools/pdbgen/pdb/edit.pdb (edit_paste): don't call
+	gimp_edit_paste() with a NULL buffer. Instead, return an execution
+	error if there is no global buffer to paste. Fixes the warning
+	triggered by bug #133244 (but not the bug itself of course).
+
+	* app/pdb/edit_cmds.c: regenerated.
+
 2004-02-05  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/imagemap/imap_main.c (dialog): quit the main loop when
diff --git a/app/pdb/edit_cmds.c b/app/pdb/edit_cmds.c
index df83f870e6..38a47ccd90 100644
--- a/app/pdb/edit_cmds.c
+++ b/app/pdb/edit_cmds.c
@@ -171,7 +171,8 @@ edit_paste_invoker (Gimp     *gimp,
 
   if (success)
     {
-      success = gimp_item_is_attached (GIMP_ITEM (drawable));
+      success = (gimp_item_is_attached (GIMP_ITEM (drawable)) &&
+		 gimp->global_buffer != NULL);
     
       if (success)
 	{
diff --git a/tools/pdbgen/pdb/edit.pdb b/tools/pdbgen/pdb/edit.pdb
index e401e313f6..8e631ea129 100644
--- a/tools/pdbgen/pdb/edit.pdb
+++ b/tools/pdbgen/pdb/edit.pdb
@@ -121,7 +121,8 @@ HELP
 	headers => [ qw("core/gimp.h") ],
 	code => <<CODE
 {
-  success = gimp_item_is_attached (GIMP_ITEM (drawable));
+  success = (gimp_item_is_attached (GIMP_ITEM (drawable)) &&
+             gimp->global_buffer != NULL);
 
   if (success)
     {