diff --git a/ChangeLog b/ChangeLog
index 4a2b30657d..d35481f564 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-10  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/gstiterator.c: (gst_iterator_new):
+	  Add assertions to make sure passed GType is likely to really
+	  be a GType (as the compiler won't catch it if the size and
+	  GType arguments get mixed up, see #318447).
+
 2005-10-10  Josef Zlomek  <josef dot zlomek at xeris dot cz>
 
 	Reviewed by: Tim-Philipp Müller  <tim at centricular dot net>
diff --git a/gst/gstiterator.c b/gst/gstiterator.c
index 287ef63b68..dbbadc469e 100644
--- a/gst/gstiterator.c
+++ b/gst/gstiterator.c
@@ -87,6 +87,8 @@ gst_iterator_new (guint size,
   GstIterator *result;
 
   g_return_val_if_fail (size >= sizeof (GstIterator), NULL);
+  g_return_val_if_fail (G_TYPE_IS_FUNDAMENTAL (type) == FALSE, NULL);
+  g_return_val_if_fail (g_type_qname (type) != 0, NULL);
   g_return_val_if_fail (master_cookie != NULL, NULL);
   g_return_val_if_fail (next != NULL, NULL);
   g_return_val_if_fail (resync != NULL, NULL);