diff --git a/src/ftxgpos.c b/src/ftxgpos.c
index 96eb80eff..10267e0ae 100644
--- a/src/ftxgpos.c
+++ b/src/ftxgpos.c
@@ -4067,7 +4067,7 @@
         while ( CHECK_Property( gdef, s_in[j], flags, &property ) )
         {
           if ( error && error != TTO_Err_Not_Covered )
-            return error;
+            goto End;
 
           if ( in->pos + j < in->length )
             j++;
@@ -4081,7 +4081,7 @@
 
           error = Get_Class( &cpf2->ClassDef, s_in[j], &classes[i], NULL );
           if ( error && error != TTO_Err_Not_Covered )
-            return error;
+            goto End;
           known_classes = i;
         }
 
@@ -5456,7 +5456,7 @@
           while ( CHECK_Property( gdef, s_in[j], flags, &property ) )
           {
             if ( error && error != TTO_Err_Not_Covered )
-              return error;
+              goto End1;
 
             if ( j > curr_pos )
               j--;
@@ -5530,7 +5530,7 @@
         while ( CHECK_Property( gdef, s_in[j], flags, &property ) )
         {
           if ( error && error != TTO_Err_Not_Covered )
-            return error;
+            goto End1;
 
           if ( curr_pos + j < in->length )
             j++;
diff --git a/src/ftxgsub.c b/src/ftxgsub.c
index 5ab955885..c2a59baa1 100644
--- a/src/ftxgsub.c
+++ b/src/ftxgsub.c
@@ -2253,7 +2253,7 @@
         while ( CHECK_Property( gdef, s_in[j], flags, &property ) )
         {
           if ( error && error != TTO_Err_Not_Covered )
-            return error;
+            goto End;
 
           if ( in->pos + j < in->length )
             j++;
@@ -2267,7 +2267,7 @@
 
           error = Get_Class( &csf2->ClassDef, s_in[j], &classes[i], NULL );
           if ( error && error != TTO_Err_Not_Covered )
-            return error;
+            goto End;
           known_classes = i;
         }