diff --git a/src/gui_beval.c b/src/gui_beval.c
index fe930f3..ae78456 100644
--- a/src/gui_beval.c
+++ b/src/gui_beval.c
@@ -1193,11 +1193,13 @@
 	    XmFontList fl;
 
 	    fl = gui_motif_fontset2fontlist(&gui.tooltip_fontset);
-	    if (fl != NULL)
+	    if (fl == NULL)
 	    {
-		XmStringExtent(fl, s, &w, &h);
-		XmFontListFree(fl);
+		XmStringFree(s);
+		return;
 	    }
+	    XmStringExtent(fl, s, &w, &h);
+	    XmFontListFree(fl);
 	}
 	w += gui.border_offset << 1;
 	h += gui.border_offset << 1;