diff --git a/panda/src/text/textNode.cxx b/panda/src/text/textNode.cxx
index 8cf643eb6c..56e849f690 100644
--- a/panda/src/text/textNode.cxx
+++ b/panda/src/text/textNode.cxx
@@ -1026,7 +1026,8 @@ measure_row(wstring::iterator &si, const wstring::iterator &send,
 
       const TextGlyph *glyph;
       float glyph_scale;
-      if (font->get_glyph(character, glyph, glyph_scale)) {
+      font->get_glyph(character, glyph, glyph_scale);
+      if (glyph != (TextGlyph *)NULL) {
         xpos += glyph->get_advance() * glyph_scale;
       }
     }