diff --git a/.hgtags b/.hgtags
index 5d59cc23443cb20a6ce1b23342a3884c5ab07190..6622fe29946fd676e589fb40fa035fbf9146dc42 100644
--- a/.hgtags
+++ b/.hgtags
@@ -462,6 +462,7 @@ c8cfbe57bcd5042d2fef42dcef14d73dd4bdc416 jdk8u60-b25
 2a5f20c49ad1de765a8c26aab1e13aee8e53b5c6 jdk8u65-b04
 fe1c420a8982e58f6d49c50b729732d93f9682dd jdk8u65-b05
 3ee40ba7525d6d5ee201a475b967ca2e5c3c9ab3 jdk8u65-b06
+bd2ad7acb217391747dae8263c090483af454313 jdk8u65-b07
 e9f82302d5fdef8a0976640e09363895e9dcde3c jdk8u66-b00
 64d7bd4e98150447916f210e3bfd6875a4c2728a jdk8u66-b01
 d8210091911b14930192abd3138ee37c281fb632 jdk8u66-b02
diff --git a/src/share/native/sun/font/layout/LookupTables.cpp b/src/share/native/sun/font/layout/LookupTables.cpp
index 6e7aa27957e01bb6c84b1bbc7205d3571d437df5..d51d0d77284382d652f222c5ce5eb1b9c70d7c97 100644
--- a/src/share/native/sun/font/layout/LookupTables.cpp
+++ b/src/share/native/sun/font/layout/LookupTables.cpp
@@ -91,6 +91,10 @@ const LookupSingle *BinarySearchLookupTable::lookupSingle(const LETableReference
     LEReferenceTo<LookupSingle> entry(base, success, entries);
     LEReferenceTo<LookupSingle> trial(entry, success, extra);
 
+    if (!LE_SUCCESS(success)) {
+        return NULL;
+    }
+
     if (SWAPW(trial->glyph) <= ttGlyph) {
         entry = trial;
     }