diff --git a/macros/upload_individual_datasets/upload_invocations.sql b/macros/upload_individual_datasets/upload_invocations.sql
index 2fc18334..1f000cff 100644
--- a/macros/upload_individual_datasets/upload_invocations.sql
+++ b/macros/upload_individual_datasets/upload_invocations.sql
@@ -109,7 +109,8 @@
         '{{ target.profile_name }}', {# target_profile_name #}
         '{{ target.name }}', {# target_name #}
         '{{ target.schema }}', {# target_schema #}
-        {{ target.threads }}, {# target_threads #}
+        {# dbt-fusion sets target.threads to None — guard against it #}
+        {% if target.threads is not none %}{{ target.threads }}{% else %}null{% endif %}, {# target_threads #}
 
         '{{ env_var('DBT_CLOUD_PROJECT_ID', '') }}', {# dbt_cloud_project_id #}
         '{{ env_var('DBT_CLOUD_JOB_ID', '') }}', {# dbt_cloud_job_id #}
@@ -172,7 +173,8 @@
             '{{ target.profile_name }}', {# target_profile_name #}
             '{{ target.name }}', {# target_name #}
             '{{ target.schema }}', {# target_schema #}
-            {{ target.threads }}, {# target_threads #}
+            {# dbt-fusion sets target.threads to None — guard against it #}
+            {% if target.threads is not none %}{{ target.threads }}{% else %}null{% endif %}, {# target_threads #}
 
             '{{ env_var("DBT_CLOUD_PROJECT_ID", "") }}', {# dbt_cloud_project_id #}
             '{{ env_var("DBT_CLOUD_JOB_ID", "") }}', {# dbt_cloud_job_id #}
@@ -234,7 +236,8 @@
             '{{ target.profile_name }}', {# target_profile_name #}
             '{{ target.name }}', {# target_name #}
             '{{ target.schema }}', {# target_schema #}
-            {{ target.threads }}, {# target_threads #}
+            {# dbt-fusion sets target.threads to None — guard against it #}
+            {% if target.threads is not none %}{{ target.threads }}{% else %}null{% endif %}, {# target_threads #}
 
             '{{ env_var("DBT_CLOUD_PROJECT_ID", "") }}', {# dbt_cloud_project_id #}
             '{{ env_var("DBT_CLOUD_JOB_ID", "") }}', {# dbt_cloud_job_id #}
@@ -317,7 +320,8 @@
         '{{ target.profile_name }}', {# target_profile_name #}
         '{{ target.name }}', {# target_name #}
         '{{ target.schema }}', {# target_schema #}
-        {{ target.threads }}, {# target_threads #}
+        {# dbt-fusion sets target.threads to None — guard against it #}
+        {% if target.threads is not none %}{{ target.threads }}{% else %}cast(null as {{ dbt.type_int() }}){% endif %}, {# target_threads #}
 
         '{{ env_var('DBT_CLOUD_PROJECT_ID', '') }}', {# dbt_cloud_project_id #}
         '{{ env_var('DBT_CLOUD_JOB_ID', '') }}', {# dbt_cloud_job_id #}
diff --git a/macros/upload_individual_datasets/upload_test_executions.sql b/macros/upload_individual_datasets/upload_test_executions.sql
index 54c0d92d..2cec6fed 100644
--- a/macros/upload_individual_datasets/upload_test_executions.sql
+++ b/macros/upload_individual_datasets/upload_test_executions.sql
@@ -79,7 +79,7 @@
 
                 {{ test.execution_time }}, {# total_node_runtime #}
                 null, {# rows_affected not available in Databricks #}
-                {{ 'null' if test.failures is none else test.failures }}, {# failures #}
+                {{ test.failures if test.failures is not none and test.failures != '' else 'null' }}, {# failures #}
                 '{{ test.message | replace("\\", "\\\\") | replace("'", "\\'") | replace('"', '\\"') | replace("\n", "\\n") }}', {# message #}
                 {{ adapter.dispatch('parse_json', 'dbt_artifacts')(tojson(test.adapter_response) | replace("\\", "\\\\") | replace("'", "\\'") | replace('"', '\\"')) }} {# adapter_response #}
             )
@@ -133,7 +133,7 @@
 
                 {{ test.execution_time }}, {# total_node_runtime #}
                 null, {# rows_affected not available in Databricks #}
-                {{ 'null' if test.failures is none else test.failures }}, {# failures #}
+                {{ test.failures if test.failures is not none and test.failures != '' else 'null' }}, {# failures #}
                 $${{ test.message  }}$$, {# message #}
                 $${{ tojson(test.adapter_response) }}$$ {# adapter_response #}
             )
@@ -186,7 +186,7 @@
 
                 {{ test.execution_time }}, {# total_node_runtime #}
                 try_cast('{{ test.adapter_response.rows_affected }}' as int), {# rows_affected #}
-                {{ 'null' if test.failures is none else test.failures }}, {# failures #}
+                {{ test.failures if test.failures is not none and test.failures != '' else 'null' }}, {# failures #}
                 '{{ test.message | replace("\\", "\\\\") | replace("'", "\\'") | replace('"', '\\"') }}', {# message #}
                 '{{ tojson(test.adapter_response) | replace("\\", "\\\\") | replace("'", "\\'") | replace('"', '\\"') }}' {# adapter_response #}
             )
@@ -226,7 +226,7 @@
 
                 {{ test.execution_time }}, {# total_node_runtime #}
                 null, {# rows_affected not available in Databricks #}
-                {{ 'null' if test.failures is none else test.failures }}, {# failures #}
+                {{ test.failures if test.failures is not none and test.failures != '' else 'null' }}, {# failures #}
                 '{{ test.message | replace("'", "''") }}', {# message #}
                 '{{ tojson(test.adapter_response) | replace("'", "''") }}' {# adapter_response #}
             )
@@ -276,7 +276,7 @@
                 {% endif %}
                 , {# rows_affected #}
 
-                {{ 'null' if test.failures is none else test.failures }}, {# failures #}
+                {{ test.failures if test.failures is not none and test.failures != '' else 'null' }}, {# failures #}
                 '{{ test.message | replace("'", "''") }}', {# message #}
                 '{{ tojson(test.adapter_response) | replace("'", "''") }}' {# adapter_response #}
             )