diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4992cc14a7a..35d2288332d 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-29  Scott Gilbertson  <scottg@mantatest.com>
+
+	* gnu/java/awt/peer/ClasspathFontPeer.java (getTransform): Never
+	return null. 
+
 2004-01-29  Kim Ho  <kho@redhat.com>
 
 	* gnu/java/awt/peer/gtk/GtkFramePeer.java
diff --git a/libjava/gnu/java/awt/peer/ClasspathFontPeer.java b/libjava/gnu/java/awt/peer/ClasspathFontPeer.java
index 3d151c89e83..4f323f7cc8e 100644
--- a/libjava/gnu/java/awt/peer/ClasspathFontPeer.java
+++ b/libjava/gnu/java/awt/peer/ClasspathFontPeer.java
@@ -501,6 +501,8 @@ public abstract class ClasspathFontPeer
 
   public AffineTransform getTransform (Font font)
   {
+    if (transform == null)
+      transform = new AffineTransform ();
     return transform;
   }