diff --git a/ChangeLog b/ChangeLog
index fd48a37d6..ed3ac466a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-25  Werner Lemberg  <wl@gnu.org>
+
+	*/*: s/Invalid_Argument/Invalid_Stream_Handle/ where appropriate.
+
 2014-11-25  Werner Lemberg  <wl@gnu.org>
 
 	*/*: s/Invalid_Argument/Invalid_Library_Handle/ where appropriate.
diff --git a/src/base/ftstream.c b/src/base/ftstream.c
index d965333da..759fd8fc0 100644
--- a/src/base/ftstream.c
+++ b/src/base/ftstream.c
@@ -728,9 +728,12 @@
     FT_Byte*  cursor;
 
 
-    if ( !fields || !stream )
+    if ( !fields )
       return FT_THROW( Invalid_Argument );
 
+    if ( !stream )
+      return FT_THROW( Invalid_Stream_Handle );
+
     cursor = stream->cursor;
 
     error = FT_Err_Ok;