diff --git a/Common/Core/Testing/Cxx/TestDataArrayAPI.cxx b/Common/Core/Testing/Cxx/TestDataArrayAPI.cxx
index 8f1d644b78ef2732166fa4843b12a671e4088c1f..91a59cca9b20eb38e7f7f25c9479fbefea51dcc8 100644
--- a/Common/Core/Testing/Cxx/TestDataArrayAPI.cxx
+++ b/Common/Core/Testing/Cxx/TestDataArrayAPI.cxx
@@ -157,7 +157,7 @@ int TestDataArrayAPI(int, char *[])
 
 #define DataArrayAPIError(x) \
   DataArrayAPINonFatalError(x) \
-  return errors;
+  DataArrayAPIFinish();
 
 namespace {
 
@@ -1093,7 +1093,6 @@ int Test_doubleptr_GetTupleN_i()
 #undef vtkDataArrayAPIGetTupleNCase
       default:
         DataArrayAPIError("Unrecognized tuple size: GetTuple" << N << "().");
-        DataArrayAPIFinish();
       }
 
     for (int c = 0; c < comps; ++c)