diff --git a/ChangeLog b/ChangeLog
index 70c5ec4886..b1b98621e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-03  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/gstmodule.c: (init_gst):
+	  don't crash when error is NULL
+
 2006-07-03  Edward Hervey  <edward@fluendo.com>
 
 	* gst/gstmessage.override:
diff --git a/common b/common
index a98b370bd4..dd173e2720 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit a98b370bd49bc3f3225bbd9013cda5a53789f53d
+Subproject commit dd173e2720ac21e4a47c97705d7ff32271a0ee66
diff --git a/gst/gstmodule.c b/gst/gstmodule.c
index eac27c6234..167d28ad03 100644
--- a/gst/gstmodule.c
+++ b/gst/gstmodule.c
@@ -140,7 +140,7 @@ init_gst (void)
 	       g_free (argv);
 	  }
           errstr = g_strdup_printf ("can't initialize module gst: %s",
-              GST_STR_NULL (error->message));
+              error ? GST_STR_NULL (error->message) : "no error given");
 	  PyErr_SetString (PyExc_RuntimeError, errstr);
           g_free (errstr);
 	  g_error_free (error);