diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc
index af0063bc5..bc5ee0f85 100644
--- a/src/hb-ot-font.cc
+++ b/src/hb-ot-font.cc
@@ -210,11 +210,11 @@ hb_ot_get_glyph_name (hb_font_t *font HB_UNUSED,
 		      void *user_data HB_UNUSED)
 {
   const hb_ot_face_t *ot_face = (const hb_ot_face_t *) font_data;
-  hb_bool_t ret = ot_face->post->get_glyph_name (glyph, name, size);
+  if (ot_face->post->get_glyph_name (glyph, name, size)) return true;
 #ifndef HB_NO_OT_FONT_CFF
-  if (!ret) ret = ot_face->cff1->get_glyph_name (glyph, name, size);
+  if (ot_face->cff1->get_glyph_name (glyph, name, size)) return true;
 #endif
-  return ret;
+  return false;
 }
 static hb_bool_t
 hb_ot_get_glyph_from_name (hb_font_t *font HB_UNUSED,