diff --git a/c/makeotf/lib/hotconv/GPOS.c b/c/makeotf/lib/hotconv/GPOS.c
index 63cb918c5..f1ee06201 100644
--- a/c/makeotf/lib/hotconv/GPOS.c
+++ b/c/makeotf/lib/hotconv/GPOS.c
@@ -379,6 +379,10 @@ int GPOSFill(hotCtx g) {
 
     createAnonLookups(g, h);
 
+    if (h->otl == NULL) {
+        return 0;
+    }
+    
     /* Add OTL features */
     /* See GSUB.c::GSUBFill() for an explanation of the subtable order */
 
diff --git a/c/makeotf/lib/hotconv/GSUB.c b/c/makeotf/lib/hotconv/GSUB.c
index 0ee266653..dcc092ce6 100644
--- a/c/makeotf/lib/hotconv/GSUB.c
+++ b/c/makeotf/lib/hotconv/GSUB.c
@@ -217,6 +217,10 @@ int GSUBFill(hotCtx g) {
 
     createAnonLookups(g, h);
 
+    if (h->otl == NULL) {
+        return 0;
+    }
+    
     /* Add OTL features */
 
     /* The font tables are in the order: