diff --git a/ChangeLog b/ChangeLog
index 25e78380f..115a9d5db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-07 13:05  Alexander Malmberg <alexander@malmberg.org>
+
+	* Source/NSFont.m (-initWithName:matrix:fix:screenFont:): Release
+	all memory if the fontInfo can't be created.
+
 2003-04-07 11:56  Alexander Malmberg <alexander@malmberg.org>
 
 	* TextConverters/RTF/rtfGrammer.y: Add error recovery rules.
diff --git a/Source/NSFont.m b/Source/NSFont.m
index c1a8909f5..4d9dfa46e 100644
--- a/Source/NSFont.m
+++ b/Source/NSFont.m
@@ -653,7 +653,9 @@ setNSFont(NSString* key, NSFont* font)
 					     screenFont: screen]);
       if (fontInfo == nil)
 	{
-	  RELEASE (self);
+	  DESTROY(fontName);
+	  DESTROY(nameWithMatrix);
+	  RELEASE(self);
 	  return nil;
 	}