diff --git a/google/cloud/bigtable/ci/run_conformance_tests_proxy_bazel.sh b/google/cloud/bigtable/ci/run_conformance_tests_proxy_bazel.sh
index cacca2022386f..18da4862fb76e 100755
--- a/google/cloud/bigtable/ci/run_conformance_tests_proxy_bazel.sh
+++ b/google/cloud/bigtable/ci/run_conformance_tests_proxy_bazel.sh
@@ -51,7 +51,7 @@ exit_status=$?
 # CloseClient
 go test -v \
   -run "TestExecuteQuery|TestExecuteQuery_PlanRefresh$|TestExecuteQuery_PlanRefresh_WithMetadataChange|TestExecuteQuery_PlanRefresh_Retries|TestExecuteQuery_FailsOnSuccesfulStreamWithNoToken" \
-  -skip "CloseClient|FailsOnEmptyMetadata|FailsOnExecuteQueryMetadata|FailsOnInvalidType|FailsOnNotEnoughData|FailsOnNotEnoughDataWithCompleteRows|FailsOnSuccesfulStreamWithNoToken|ChecksumMismatch|FailsOnTypeMismatch|FailsOnTypeMismatchWithinMap|FailsOnTypeMismatchWithinArray|FailsOnTypeMismatchWithinStruct|FailsOnStructMissingField|TestExecuteQuery_PlanRefresh_AfterResumeTokenCausesError|TestExecuteQuery_RetryTest_WithPlanRefresh|TestExecuteQuery_PlanRefresh_RespectsDeadline|TestExecuteQuery_PlanRefresh_RecoversAfterPermanentError" \
+  -skip "CloseClient|FailsOnEmptyMetadata|FailsOnExecuteQueryMetadata|FailsOnInvalidType|ChecksumMismatch|FailsOnTypeMismatch|FailsOnTypeMismatchWithinMap|FailsOnTypeMismatchWithinArray|FailsOnTypeMismatchWithinStruct|FailsOnStructMissingField|TestExecuteQuery_PlanRefresh_AfterResumeTokenCausesError|TestExecuteQuery_RetryTest_WithPlanRefresh|TestExecuteQuery_PlanRefresh_RespectsDeadline|TestExecuteQuery_PlanRefresh_RecoversAfterPermanentError" \
   -proxy_addr=:9999
 exit_status=$?
 
@@ -67,7 +67,7 @@ exit_status=$?
 
 # Stream reading tests b/461232110
 #go test -v \
-#  -run "FailsOnNotEnoughData|FailsOnNotEnoughDataWithCompleteRows|ChecksumMismatch" \
+#  -run "ChecksumMismatch" \
 #  -proxy_addr=:9999
 #exit_status=$?
 
@@ -79,7 +79,7 @@ exit_status=$?
 
 # QueryPlan refresh tests b/461233613
 #go test -v \
-#  -run "RetryTest_WithPlanRefresh|PlanRefresh" \
+#  -run "RetryTest_WithPlanRefresh|PlanRefresh|PlanRefresh_RecoversAfterPermanentError" \
 #  -proxy_addr=:9999
 #exit_status=$?
 
diff --git a/google/cloud/bigtable/internal/partial_result_set_source.cc b/google/cloud/bigtable/internal/partial_result_set_source.cc
index 1c152a9b5c0ae..7ff8816b71a6b 100644
--- a/google/cloud/bigtable/internal/partial_result_set_source.cc
+++ b/google/cloud/bigtable/internal/partial_result_set_source.cc
@@ -208,9 +208,10 @@ Status PartialResultSetSource::BufferProtoRows() {
           GCP_ERROR_INFO());
     }
     if (proto_values.size() % columns_size != 0) {
+      state_ = State::kFinished;
       return internal::InternalError(
           "The number of values in ProtoRows is not a multiple of the "
-          "number of columns in the schema.",
+          "number of columns in the schema or received incomplete row",
           GCP_ERROR_INFO());
     }