diff --git a/ChangeLog b/ChangeLog
index 8c3bb40640..d16ffbb626 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-24  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/gstbin.c: (gst_bin_add):
+          add error for not being able to add elements
+
 2004-02-22  Julien MOUTTE <julien@moutte.net>
 
 	* gst/gsttag.c: (_gst_tag_initialize): Registering 2 new tags,
@@ -230,7 +235,7 @@
 2004-02-13  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac: pass required libxml version as argument
-          (bug reported by Christophe Fergeau)
+	(bug reported by Christophe Fergeau)
 
 2004-02-12  Thomas Vander Stichele  <thomas at apestaart dot org>
   
@@ -347,7 +352,6 @@
           require gettext 0.11.5 so ulonglong.m4 gets checked out and copied
           by autopoint (fixes #132996)
 
->>>>>>> 1.260
 2004-02-10  Andy Wingo  <wingo@pobox.com>
 
 	* gst/gstpad.c (gst_pad_custom_new): Add a FIXME, this is a hacky
@@ -911,7 +915,6 @@
 	* gst/gstvalue.h:
         sync .h with .c declarations
 
->>>>>>> 1.182
 2004-01-30  Julien Moutte  <julien@moutte.net>
 
 	* libs/gst/bytestream/bytestream.c: Reverting my event handling patch.
@@ -1286,7 +1289,6 @@
 
 	  Time to get into the advanced topics. ;).
 
->>>>>>> 1.174
 2004-01-27  Ronald Bultje  <rbultje@ronald.bitfreak.net>
 
 	* docs/pwg/advanced_types.xml:
@@ -1377,7 +1379,6 @@
 	* gst/gsttag.h:
           add GstTagFlag
 
->>>>>>> 1.143
 2004-01-20  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* docs/gst/gstreamer-sections.txt:
diff --git a/docs/gst/tmpl/gstxml.sgml b/docs/gst/tmpl/gstxml.sgml
index 32d00bc1f9..73bfbd51f8 100644
--- a/docs/gst/tmpl/gstxml.sgml
+++ b/docs/gst/tmpl/gstxml.sgml
@@ -110,6 +110,10 @@ All GstElements can be serialized to an XML presentation and subsequently loaded
 
 </para>
 
+@: 
+@: 
+@:
+
 @gstxml: the object which received the signal.
 @arg1: 
 @arg2: 
diff --git a/gst/gstbin.c b/gst/gstbin.c
index 690cd82316..4c05978caf 100644
--- a/gst/gstbin.c
+++ b/gst/gstbin.c
@@ -28,6 +28,7 @@
 #include "gstmarshal.h"
 #include "gstxml.h"
 #include "gstinfo.h"
+#include "gsterror.h"
 
 #include "gstscheduler.h"
 #include "gstindex.h"
@@ -495,7 +496,9 @@ gst_bin_add (GstBin *bin, GstElement *element)
     bclass->add_element (bin, element);
   }
   else {
-    g_warning ("cannot add elements to bin %s\n", GST_ELEMENT_NAME (bin));
+    GST_ELEMENT_ERROR (bin, CORE, FAILED, (NULL),
+                       ("cannot add element %s to bin %s",
+	                GST_ELEMENT_NAME (element), GST_ELEMENT_NAME (bin)));
   }
 }