diff --git a/ChangeLog b/ChangeLog
index 2e2cf1902..fd48a37d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-25  Werner Lemberg  <wl@gnu.org>
+
+	*/*: s/Invalid_Argument/Invalid_Library_Handle/ where appropriate.
+
 2014-11-25  Werner Lemberg  <wl@gnu.org>
 
 	*/*: s/Invalid_Argument/Invalid_Outline/ where appropriate.
diff --git a/src/base/ftlcdfil.c b/src/base/ftlcdfil.c
index 1f23c4c12..d8bcbbf1d 100644
--- a/src/base/ftlcdfil.c
+++ b/src/base/ftlcdfil.c
@@ -289,7 +289,10 @@
   FT_Library_SetLcdFilterWeights( FT_Library      library,
                                   unsigned char  *weights )
   {
-    if ( !library || !weights )
+    if ( !library )
+      return FT_THROW( Invalid_Library_Handle );
+
+    if ( !weights )
       return FT_THROW( Invalid_Argument );
 
     ft_memcpy( library->lcd_weights, weights, 5 );
@@ -311,7 +314,7 @@
 
 
     if ( !library )
-      return FT_THROW( Invalid_Argument );
+      return FT_THROW( Invalid_Library_Handle );
 
     switch ( filter )
     {
diff --git a/src/base/ftstroke.c b/src/base/ftstroke.c
index 82dfa663f..c63e138e1 100644
--- a/src/base/ftstroke.c
+++ b/src/base/ftstroke.c
@@ -795,7 +795,7 @@
 
 
     if ( !library )
-      return FT_THROW( Invalid_Argument );
+      return FT_THROW( Invalid_Library_Handle );
 
     memory = library->memory;