diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc
index 3bd5a4313..944f5b7fd 100644
--- a/src/hb-ot-font.cc
+++ b/src/hb-ot-font.cc
@@ -92,11 +92,11 @@ _hb_ot_font_create (hb_font_t *font)
     cmap_cache = (hb_ot_font_cmap_cache_t *) hb_malloc (sizeof (hb_ot_font_cmap_cache_t));
     if (unlikely (!cmap_cache)) goto out;
     cmap_cache->init ();
-    if (!hb_face_set_user_data (font->face,
-				&hb_ot_font_cmap_cache_user_data_key,
-				cmap_cache,
-				hb_free,
-				false))
+    if (!unlikely (hb_face_set_user_data (font->face,
+					  &hb_ot_font_cmap_cache_user_data_key,
+					  cmap_cache,
+					  hb_free,
+					  false)))
     {
       /* Normally we would retry after this, but that would
        * infinite-loop if the face is the empty-face.