diff --git a/ChangeLog b/ChangeLog
index bdc0c80461..76011411ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-03  Benjamin Otte  <otte@gnome.org>
+
+	* gst/schedulers/entryscheduler.c: 
+	  remove unused variable, fix error inside Rb, fix compile warning in
+	  unreachable code
+
 2004-04-03  Benjamin Otte  <otte@gnome.org>
 
 	* gst/schedulers/entryscheduler.c:
diff --git a/gst/schedulers/entryscheduler.c b/gst/schedulers/entryscheduler.c
index 0ac7e26810..6b941c77cf 100644
--- a/gst/schedulers/entryscheduler.c
+++ b/gst/schedulers/entryscheduler.c
@@ -132,8 +132,6 @@ struct _GstEntryScheduler
   GList *schedule_possible;     /* possible entry points */
   GList *waiting;               /* elements waiting for the clock */
   gboolean error;               /* if an element threw an error */
-
-  GList *decoupled_pads;        /* all pads we manage that belong to decoupled elements */
 };
 
 struct _GstEntrySchedulerClass
@@ -887,7 +885,8 @@ gst_entry_scheduler_state_transition (GstScheduler * scheduler,
           }
         }
       }
-      if (element->sched_private != NULL) {
+      if (element->sched_private != NULL
+          && ELEMENT_PRIVATE (element)->thread != NULL) {
         do_cothread_destroy (ELEMENT_PRIVATE (element)->thread);
         ELEMENT_PRIVATE (element)->thread = NULL;
       }