diff --git a/ChangeLog b/ChangeLog
index 8eda7e481..fad0c9eac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-20  Werner Lemberg  <wl@gnu.org>
+
+	Fix Savannah bug #30145.
+
+	* src/psaux/psobjs.c (t1_builder_add_contour): Protect against
+	`outline == NULL' which might happen in invalid fonts.
+
 2010-06-19  Werner Lemberg  <wl@gnu.org>
 
 	Fix Savannah bug #30135.
diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
index 6df4d1afc..45c741914 100644
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -1589,6 +1589,13 @@
     FT_Error     error;
 
 
+    /* this might happen in invalid fonts */
+    if ( !outline )
+    {
+      FT_ERROR(( "t1_builder_add_contour: no outline to add points to\n" ));
+      return PSaux_Err_Invalid_File_Format;
+    }
+
     if ( !builder->load_points )
     {
       outline->n_contours++;