diff --git a/tools/gcp/utils/big_query_utils.py b/tools/gcp/utils/big_query_utils.py
index 6e9cda376ba..168b48d1e65 100755
--- a/tools/gcp/utils/big_query_utils.py
+++ b/tools/gcp/utils/big_query_utils.py
@@ -178,6 +178,7 @@ def insert_rows(big_query, project_id, dataset_id, table_id, rows_list):
             is_success = False
     except HttpError as http_error:
         print('Error inserting rows to the table %s' % table_id)
+        print('Error message: %s' % http_error)
         is_success = False
 
     return is_success
diff --git a/tools/run_tests/python_utils/upload_rbe_results.py b/tools/run_tests/python_utils/upload_rbe_results.py
index 11cc1aa5dd4..bda567e977e 100755
--- a/tools/run_tests/python_utils/upload_rbe_results.py
+++ b/tools/run_tests/python_utils/upload_rbe_results.py
@@ -122,7 +122,7 @@ def _get_resultstore_data(api_key, invocation_id):
     while True:
         req = urllib2.Request(
             url=
-            'https://resultstore.googleapis.com/v2/invocations/%s/targets/-/configuredTargets/-/actions?key=%s&pageToken=%s&fields=next_page_token,actions.id,actions.status_attributes'
+            'https://resultstore.googleapis.com/v2/invocations/%s/targets/-/configuredTargets/-/actions?key=%s&pageToken=%s&fields=next_page_token,actions.id,actions.status_attributes,actions.timing,actions.test_action'
             % (invocation_id, api_key, page_token),
             headers={
                 'Content-Type': 'application/json'
@@ -185,6 +185,8 @@ if __name__ == "__main__":
                 'startTime':
                 resultstore_actions[index - 1]['timing']['startTime']
             }
+        elif 'testSuite' not in action['testAction']:
+            continue
         else:
             test_cases = action['testAction']['testSuite']['tests'][0][
                 'testSuite']['tests']