diff --git a/ChangeLog b/ChangeLog
index a9436303..28723f05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-02-15  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	* src/base/ftmac.c (FT_New_Face_From_SFNT): Check the sfnt resource
+	handle by its value instead of ResError(), fix provided by Deron
+	Kazmaier. According to Resource Manager Reference, GetResource(),
+	Get1Resource(), GetNamedResource(), Get1NamedResource()
+	and RGetResource() set noErr but returns NULL handle when they can
+	not find requested resource. These functions never return undefined
+	values, so it is sufficient to check if the handle is not NULL.
+
+	* builds/mac/ftmac.c (FT_New_Face_From_SFNT): Ditto.
+
 2008-02-14  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
 	* src/base/ftbase.c: <ftmac.c> is replaced by "ftmac.c" as other
diff --git a/builds/mac/ftmac.c b/builds/mac/ftmac.c
index b83fecbe..b0b79ea1 100644
--- a/builds/mac/ftmac.c
+++ b/builds/mac/ftmac.c
@@ -1207,7 +1207,7 @@ typedef short   ResourceIndex;
 
 
     sfnt = GetResource( FT_MAKE_TAG( 's', 'f', 'n', 't' ), sfnt_id );
-    if ( ResError() )
+    if ( sfnt == NULL )
       return FT_Err_Invalid_Handle;
 
     sfnt_size = (FT_ULong)GetHandleSize( sfnt );
diff --git a/src/base/ftmac.c b/src/base/ftmac.c
index 1b9ffe9f..8aa08c3c 100644
--- a/src/base/ftmac.c
+++ b/src/base/ftmac.c
@@ -828,7 +828,7 @@ typedef short ResourceIndex;
 
 
     sfnt = GetResource( FT_MAKE_TAG( 's', 'f', 'n', 't' ), sfnt_id );
-    if ( ResError() )
+    if ( sfnt == NULL )
       return FT_Err_Invalid_Handle;
 
     sfnt_size = (FT_ULong)GetHandleSize( sfnt );