diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Job.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Job.java
index 181370d74..6ef7eb906 100644
--- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Job.java
+++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Job.java
@@ -297,8 +297,10 @@ public TableResult getQueryResults(QueryResultsOption... options)
       job = reload();
     }
     if (job.getStatus() != null && job.getStatus().getError() != null) {
-      throw new JobException(
-          getJobId(), ImmutableList.copyOf(job.getStatus().getExecutionErrors()));
+      throw new BigQueryException(
+          job.getStatus().getExecutionErrors() == null
+              ? ImmutableList.of(job.getStatus().getError())
+              : ImmutableList.copyOf(job.getStatus().getExecutionErrors()));
     }
 
     // If there are no rows in the result, this may have been a DDL query.