diff --git a/ChangeLog b/ChangeLog
index 95b89dcb4b..b6b36b76e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-09  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* sys/ximage/ximagesink.c:
+	* sys/xvimage/xvimagesink.c:
+	  assign all TOO_LAZY's to a real category.  Thanks to Warthy Warthog.
+
 2004-08-06  Wim Taymans  <wim@fluendo.com>
 
 	* gst/tcp/gstmultifdsink.c: (gst_multifdsink_class_init),
diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index ea8dbfe619..d2851f0e7c 100644
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -746,7 +746,7 @@ gst_ximagesink_xcontext_get (GstXImageSink * ximagesink)
   if (!xcontext->disp) {
     g_mutex_unlock (ximagesink->x_lock);
     g_free (xcontext);
-    GST_ELEMENT_ERROR (ximagesink, RESOURCE, TOO_LAZY, (NULL),
+    GST_ELEMENT_ERROR (ximagesink, RESOURCE, WRITE, (NULL),
         ("Could not open display"));
     return NULL;
   }
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index 1b9d6d5ce8..4077d46b7e 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -684,7 +684,7 @@ gst_xvimagesink_get_xv_support (GstXvImageSink * xvimagesink,
 
   /* First let's check that XVideo extension is available */
   if (!XQueryExtension (xcontext->disp, "XVideo", &i, &i, &i)) {
-    GST_ELEMENT_ERROR (xvimagesink, RESOURCE, TOO_LAZY, (NULL),
+    GST_ELEMENT_ERROR (xvimagesink, RESOURCE, SETTINGS, (NULL),
         ("XVideo extension is not available"));
     return NULL;
   }
@@ -692,7 +692,7 @@ gst_xvimagesink_get_xv_support (GstXvImageSink * xvimagesink,
   /* Then we get adaptors list */
   if (Success != XvQueryAdaptors (xcontext->disp, xcontext->root,
           &nb_adaptors, &adaptors)) {
-    GST_ELEMENT_ERROR (xvimagesink, RESOURCE, TOO_LAZY, (NULL),
+    GST_ELEMENT_ERROR (xvimagesink, RESOURCE, SETTINGS, (NULL),
         ("Failed getting XV adaptors list"));
     return NULL;
   }
@@ -722,7 +722,7 @@ gst_xvimagesink_get_xv_support (GstXvImageSink * xvimagesink,
   XvFreeAdaptorInfo (adaptors);
 
   if (!xcontext->xv_port_id) {
-    GST_ELEMENT_ERROR (xvimagesink, RESOURCE, TOO_LAZY, (NULL),
+    GST_ELEMENT_ERROR (xvimagesink, RESOURCE, BUSY, (NULL),
         ("No port available"));
     return NULL;
   }
@@ -810,7 +810,7 @@ gst_xvimagesink_get_xv_support (GstXvImageSink * xvimagesink,
   if (gst_caps_is_empty (caps)) {
     gst_caps_free (caps);
     XvUngrabPort (xcontext->disp, xcontext->xv_port_id, 0);
-    GST_ELEMENT_ERROR (xvimagesink, RESOURCE, TOO_LAZY, (NULL),
+    GST_ELEMENT_ERROR (xvimagesink, STREAM, WRONG_TYPE, (NULL),
         ("No supported format found"));
     return NULL;
   }
@@ -899,7 +899,7 @@ gst_xvimagesink_xcontext_get (GstXvImageSink * xvimagesink)
   if (!xcontext->disp) {
     g_mutex_unlock (xvimagesink->x_lock);
     g_free (xcontext);
-    GST_ELEMENT_ERROR (xvimagesink, RESOURCE, TOO_LAZY, (NULL),
+    GST_ELEMENT_ERROR (xvimagesink, RESOURCE, WRITE, (NULL),
         ("Could not open display"));
     return NULL;
   }
@@ -929,7 +929,7 @@ gst_xvimagesink_xcontext_get (GstXvImageSink * xvimagesink)
     XCloseDisplay (xcontext->disp);
     g_mutex_unlock (xvimagesink->x_lock);
     g_free (xcontext);
-    GST_ELEMENT_ERROR (xvimagesink, RESOURCE, TOO_LAZY, (NULL),
+    GST_ELEMENT_ERROR (xvimagesink, RESOURCE, SETTINGS, (NULL),
         ("Could not get pixel formats"));
     return NULL;
   }