1 files changed, 15 insertions, 1 deletions
diff --git a/libjava/gnu/gcj/xlib/Font.java b/libjava/gnu/gcj/xlib/Font.java
index cd2fff9630d..74985b9388e 100644
--- a/libjava/gnu/gcj/xlib/Font.java
+++ b/libjava/gnu/gcj/xlib/Font.java
@@ -34,7 +34,21 @@ public final class Font extends XID
     structure = struct;
   }
 
-  static native RawData loadFont(Display display, String lfdNamePattern);
+  static RawData loadFont(Display display, String lfdNamePattern)
+  {
+    RawData returnValue = null;
+    try
+    {
+      returnValue = loadFontImpl (display,lfdNamePattern);
+    }
+    catch (XException e)
+    {
+      // Throw a descriptive exception, including the font pattern
+      throw new XException ("Font not found: " + lfdNamePattern);
+    }
+    return returnValue;
+  }
+  static native RawData loadFontImpl(Display display, String lfdNamePattern);
 
   static native int getXIDFromStruct(RawData structure);