diff --git a/ChangeLog b/ChangeLog
index 5f415bf54..c6ed98daa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-23  Ben Wagner  <bungeman@google.com>
+
+	[sfnt] Correctly handle missing bitmaps in sbix format (#53404).
+
+	* src/sfnt/ttfsbit.c (tt_face_load_sbix_image): Fix return value.
+
 2018-03-23  Ben Wagner  <bungeman@google.com>
 
 	[truetype] Fix advance of empty glyphs in bitmap fonts (#53393).
diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c
index 53e61756d..33b8640bc 100644
--- a/src/sfnt/ttsbit.c
+++ b/src/sfnt/ttsbit.c
@@ -1514,7 +1514,7 @@
     FT_FRAME_EXIT();
 
     if ( glyph_start == glyph_end )
-      return FT_THROW( Invalid_Argument );
+      return FT_THROW( Missing_Bitmap );
     if ( glyph_start > glyph_end                     ||
          glyph_end - glyph_start < 8                 ||
          face->ebdt_size - strike_offset < glyph_end )