diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/AbstractPrestoSparkQueryExecution.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/AbstractPrestoSparkQueryExecution.java
index 9a1f76b5c6203..df486b3225667 100644
--- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/AbstractPrestoSparkQueryExecution.java
+++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/AbstractPrestoSparkQueryExecution.java
@@ -415,7 +415,8 @@ else if (executionException instanceof TimeoutException) {
                 types.size() == 1 &&
                 types.get(0).equals(BIGINT) &&
                 results.size() == 1 &&
-                results.get(0).size() == 1) {
+                results.get(0).size() == 1 &&
+                results.get(0).get(0) != null) {
             updateCount = OptionalLong.of(((Number) results.get(0).get(0)).longValue());
         }
 
diff --git a/presto-spark-base/src/test/java/com/facebook/presto/spark/PrestoSparkQueryRunner.java b/presto-spark-base/src/test/java/com/facebook/presto/spark/PrestoSparkQueryRunner.java
index c97cb6a060025..f8e2e50d34dc9 100644
--- a/presto-spark-base/src/test/java/com/facebook/presto/spark/PrestoSparkQueryRunner.java
+++ b/presto-spark-base/src/test/java/com/facebook/presto/spark/PrestoSparkQueryRunner.java
@@ -532,7 +532,7 @@ private MaterializedResult execute(
                         ImmutableMap.of(),
                         ImmutableSet.of(),
                         p.getUpdateType(),
-                        OptionalLong.of((Long) getOnlyElement(getOnlyElement(rows).getFields())),
+                        getOnlyElement(getOnlyElement(rows).getFields()) == null ? OptionalLong.empty() : OptionalLong.of((Long) getOnlyElement(getOnlyElement(rows).getFields())),
                         ImmutableList.of());
             }
         }