diff --git a/ChangeLog b/ChangeLog
index 462de86..8b81bbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-02 17:28  Alexander Malmberg <alexander@malmberg.org>
+
+	* Source/art/ftfont.m (-initWithFontName:matrix:screenFont:):
+	Return nil if it's not a valid font.
+
 2003-07-01 16:37  Alexander Malmberg <alexander@malmberg.org>
 
 	* Source/art/ftfont.m: Use the correct set of flags when loading
diff --git a/Source/art/ftfont.m b/Source/art/ftfont.m
index e4d8ad5..6bb0763 100644
--- a/Source/art/ftfont.m
+++ b/Source/art/ftfont.m
@@ -652,10 +652,8 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_
   font_entry = [fcfg_all_fonts objectForKey: name];
   if (!font_entry)
     {
-      NSLog(@"Warning: font '%@' doesn't exist",name);
-      name = [fcfg_allFontNames objectAtIndex: 0];
-      font_entry = [fcfg_all_fonts objectForKey: name];
-      NSLog(@"falling back to '%@'",name);
+      [self release];
+      return nil;
     }
 
   face_info = font_entry;