diff --git a/ChangeLog b/ChangeLog
index be8535538..1024f71e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-10-08  Werner Lemberg  <wl@gnu.org>
+
+	* src/cid/cidload.c (cid_face_open): Properly propagate `error'.
+
 2016-10-08  Werner Lemberg  <wl@gnu.org>
 
 	[cid] Fix parsing of subr offsets.
diff --git a/src/cid/cidload.c b/src/cid/cidload.c
index a0a5c2495..15d962394 100644
--- a/src/cid/cidload.c
+++ b/src/cid/cidload.c
@@ -733,9 +733,11 @@
       }
 
       /* we must convert the data section from hexadecimal to binary */
-      if ( FT_ALLOC( face->binary_data, parser->binary_length )         ||
-           cid_hex_to_binary( face->binary_data, parser->binary_length,
-                              parser->data_offset, face )               )
+      if ( FT_ALLOC( face->binary_data, parser->binary_length ) ||
+           ( error = cid_hex_to_binary( face->binary_data,
+                                        parser->binary_length,
+                                        parser->data_offset,
+                                        face ) )                )
         goto Exit;
 
       FT_Stream_OpenMemory( face->cid_stream,