diff --git a/src/lib/evas/common/evas_font_draw.c b/src/lib/evas/common/evas_font_draw.c
index c4f6bc2ba4..74aeda092d 100644
--- a/src/lib/evas/common/evas_font_draw.c
+++ b/src/lib/evas/common/evas_font_draw.c
@@ -225,8 +225,6 @@ evas_common_font_rgba_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y,
 void
 evas_common_font_glyphs_ref(Evas_Glyph_Array *array)
 {
-   if (!array) return;
-
    eina_lock_take(&array->lock);
    array->refcount++;
    eina_lock_release(&array->lock);
@@ -235,8 +233,6 @@ evas_common_font_glyphs_ref(Evas_Glyph_Array *array)
 void
 evas_common_font_glyphs_unref(Evas_Glyph_Array *array)
 {
-   if (!array) return;
-
    eina_lock_take(&array->lock);
    if (--array->refcount)
      {
@@ -305,7 +301,7 @@ evas_common_font_draw_prepare(Evas_Text_Props *text_props)
     * reference is only used to use this from another thread, which is now
     * holding the reference.
     */
-   evas_common_font_glyphs_unref(text_props->glyphs);
+   if (text_props->glyphs) evas_common_font_glyphs_unref(text_props->glyphs);
 
    text_props->glyphs = malloc(sizeof(*text_props->glyphs));
    if (!text_props->glyphs) goto error;
diff --git a/src/lib/evas/common/evas_text_utils.c b/src/lib/evas/common/evas_text_utils.c
index 71b4fa6ddc..f1fd0b3276 100644
--- a/src/lib/evas/common/evas_text_utils.c
+++ b/src/lib/evas/common/evas_text_utils.c
@@ -89,8 +89,8 @@ evas_common_text_props_content_unref(Evas_Text_Props *props)
    /* No content in this case */
    if (!props->info)
       return;
-   
-   evas_common_font_glyphs_unref(props->glyphs);
+
+   if (props->glyphs) evas_common_font_glyphs_unref(props->glyphs);
    /* After unreferencing the glyph array, a thread will still hold
     * a reference, so this can be safely set to NULL. */
    props->glyphs = NULL;