diff --git a/presto-main/src/main/java/com/facebook/presto/event/QueryMonitor.java b/presto-main/src/main/java/com/facebook/presto/event/QueryMonitor.java
index ad520db95afe..0aed58742b6a 100644
--- a/presto-main/src/main/java/com/facebook/presto/event/QueryMonitor.java
+++ b/presto-main/src/main/java/com/facebook/presto/event/QueryMonitor.java
@@ -210,8 +210,8 @@ private QueryStatistics createQueryStatistics(QueryInfo queryInfo)
                 ofMillis(queryStats.getTotalCpuTime().toMillis()),
                 ofMillis(queryStats.getTotalScheduledTime().toMillis()),
                 ofMillis(queryStats.getQueuedTime().toMillis()),
-                Optional.ofNullable(queryStats.getAnalysisTime()).map(duration -> ofMillis(duration.toMillis())),
-                Optional.ofNullable(queryStats.getDistributedPlanningTime()).map(duration -> ofMillis(duration.toMillis())),
+                Optional.of(ofMillis(queryStats.getAnalysisTime().toMillis())),
+                Optional.of(ofMillis(queryStats.getDistributedPlanningTime().toMillis())),
                 queryStats.getPeakUserMemoryReservation().toBytes(),
                 queryStats.getPeakTotalMemoryReservation().toBytes(),
                 queryStats.getPeakTaskTotalMemory().toBytes(),
@@ -363,7 +363,7 @@ private static void logQueryTimeline(QueryInfo queryInfo)
             }
 
             // planning duration -- start to end of planning
-            long planning = max(queryStats.getTotalPlanningTime() == null ? 0 : queryStats.getTotalPlanningTime().toMillis(), 0);
+            long planning = queryStats.getTotalPlanningTime().toMillis();
 
             List<StageInfo> stages = StageInfo.getAllStages(queryInfo.getOutputStage());
             // long lastSchedulingCompletion = 0;
diff --git a/presto-main/src/main/java/com/facebook/presto/execution/QueryStateMachine.java b/presto-main/src/main/java/com/facebook/presto/execution/QueryStateMachine.java
index f77177930219..5f716b2d622a 100644
--- a/presto-main/src/main/java/com/facebook/presto/execution/QueryStateMachine.java
+++ b/presto-main/src/main/java/com/facebook/presto/execution/QueryStateMachine.java
@@ -471,12 +471,12 @@ private QueryStats getQueryStats(Optional<StageInfo> rootStage)
 
                 queryStateTimer.getElapsedTime(),
                 queryStateTimer.getQueuedTime(),
-                queryStateTimer.getResourceWaitingTime().orElse(null),
+                queryStateTimer.getResourceWaitingTime(),
                 queryStateTimer.getExecutionTime(),
-                queryStateTimer.getAnalysisTime().orElse(null),
-                queryStateTimer.getDistributedPlanningTime().orElse(null),
-                queryStateTimer.getPlanningTime().orElse(null),
-                queryStateTimer.getFinishingTime().orElse(null),
+                queryStateTimer.getAnalysisTime(),
+                queryStateTimer.getDistributedPlanningTime(),
+                queryStateTimer.getPlanningTime(),
+                queryStateTimer.getFinishingTime(),
 
                 totalTasks,
                 runningTasks,
diff --git a/presto-main/src/main/java/com/facebook/presto/execution/QueryStateTimer.java b/presto-main/src/main/java/com/facebook/presto/execution/QueryStateTimer.java
index 6595d11f7f6f..b974e1a2bfd4 100644
--- a/presto-main/src/main/java/com/facebook/presto/execution/QueryStateTimer.java
+++ b/presto-main/src/main/java/com/facebook/presto/execution/QueryStateTimer.java
@@ -192,19 +192,19 @@ public Duration getQueuedTime()
         return getElapsedTime();
     }
 
-    public Optional<Duration> getResourceWaitingTime()
+    public Duration getResourceWaitingTime()
     {
-        return Optional.ofNullable(resourceWaitingTime.get());
+        return getDuration(resourceWaitingTime, beginResourceWaitingNanos);
     }
 
-    public Optional<Duration> getPlanningTime()
+    public Duration getPlanningTime()
     {
-        return Optional.ofNullable(planningTime.get());
+        return getDuration(planningTime, beginPlanningNanos);
     }
 
-    public Optional<Duration> getFinishingTime()
+    public Duration getFinishingTime()
     {
-        return Optional.ofNullable(finishingTime.get());
+        return getDuration(finishingTime, beginFinishingNanos);
     }
 
     public Duration getExecutionTime()
@@ -217,14 +217,14 @@ public Optional<DateTime> getEndTime()
         return toDateTime(endNanos);
     }
 
-    public Optional<Duration> getAnalysisTime()
+    public Duration getAnalysisTime()
     {
-        return Optional.ofNullable(analysisTime.get());
+        return getDuration(analysisTime, beginAnalysisNanos);
     }
 
-    public Optional<Duration> getDistributedPlanningTime()
+    public Duration getDistributedPlanningTime()
     {
-        return Optional.ofNullable(distributedPlanningTime.get());
+        return getDuration(distributedPlanningTime, beginDistributedPlanningNanos);
     }
 
     public DateTime getLastHeartbeat()
diff --git a/presto-main/src/main/java/com/facebook/presto/execution/QueryStats.java b/presto-main/src/main/java/com/facebook/presto/execution/QueryStats.java
index ad570f0e01a0..b47511267a48 100644
--- a/presto-main/src/main/java/com/facebook/presto/execution/QueryStats.java
+++ b/presto-main/src/main/java/com/facebook/presto/execution/QueryStats.java
@@ -154,14 +154,14 @@ public QueryStats(
         this.lastHeartbeat = requireNonNull(lastHeartbeat, "lastHeartbeat is null");
         this.endTime = endTime;
 
-        this.elapsedTime = elapsedTime;
-        this.queuedTime = queuedTime;
-        this.resourceWaitingTime = resourceWaitingTime;
+        this.elapsedTime = requireNonNull(elapsedTime, "elapsedTime is null");
+        this.queuedTime = requireNonNull(queuedTime, "queuedTime is null");
+        this.resourceWaitingTime = requireNonNull(resourceWaitingTime, "resourceWaitingTime is null");
         this.executionTime = requireNonNull(executionTime, "executionTime is null");
-        this.analysisTime = analysisTime;
-        this.distributedPlanningTime = distributedPlanningTime;
-        this.totalPlanningTime = totalPlanningTime;
-        this.finishingTime = finishingTime;
+        this.analysisTime = requireNonNull(analysisTime, "analysisTime is null");
+        this.distributedPlanningTime = requireNonNull(distributedPlanningTime, "distributedPlanningTime is null");
+        this.totalPlanningTime = requireNonNull(totalPlanningTime, "totalPlanningTime is null");
+        this.finishingTime = requireNonNull(finishingTime, "finishingTime is null");
 
         checkArgument(totalTasks >= 0, "totalTasks is negative");
         this.totalTasks = totalTasks;
@@ -225,8 +225,8 @@ public static QueryStats immediateFailureQueryStats()
                 new Duration(0, MILLISECONDS),
                 new Duration(0, MILLISECONDS),
                 new Duration(0, MILLISECONDS),
-                null,
-                null,
+                new Duration(0, MILLISECONDS),
+                new Duration(0, MILLISECONDS),
                 new Duration(0, MILLISECONDS),
                 new Duration(0, MILLISECONDS),
                 0,
@@ -300,10 +300,6 @@ public Duration getResourceWaitingTime()
     @JsonProperty
     public Duration getQueuedTime()
     {
-        if (queuedTime == null) {
-            // counter-intuitively, this means that the query is still queued
-            return elapsedTime;
-        }
         return queuedTime;
     }
 
diff --git a/presto-main/src/main/java/com/facebook/presto/server/BasicQueryStats.java b/presto-main/src/main/java/com/facebook/presto/server/BasicQueryStats.java
index 247d11e5b116..a395f7f8bf09 100644
--- a/presto-main/src/main/java/com/facebook/presto/server/BasicQueryStats.java
+++ b/presto-main/src/main/java/com/facebook/presto/server/BasicQueryStats.java
@@ -90,9 +90,9 @@ public BasicQueryStats(
         this.createTime = createTime;
         this.endTime = endTime;
 
-        this.queuedTime = queuedTime;
-        this.elapsedTime = elapsedTime;
-        this.executionTime = executionTime;
+        this.queuedTime = requireNonNull(queuedTime, "queuedTime is null");
+        this.elapsedTime = requireNonNull(elapsedTime, "elapsedTime is null");
+        this.executionTime = requireNonNull(executionTime, "executionTime is null");
 
         checkArgument(totalDrivers >= 0, "totalDrivers is negative");
         this.totalDrivers = totalDrivers;
diff --git a/presto-main/src/test/java/com/facebook/presto/execution/TestQueryStateMachine.java b/presto-main/src/test/java/com/facebook/presto/execution/TestQueryStateMachine.java
index fb8d05566ce3..c19dda8a379c 100644
--- a/presto-main/src/test/java/com/facebook/presto/execution/TestQueryStateMachine.java
+++ b/presto-main/src/test/java/com/facebook/presto/execution/TestQueryStateMachine.java
@@ -166,16 +166,10 @@ private void assertAllTimeSpentInQueueing(QueryState expectedState, Consumer<Que
 
         QueryStats queryStats = stateMachine.getQueryInfo(Optional.empty()).getQueryStats();
         assertEquals(queryStats.getQueuedTime(), new Duration(7, MILLISECONDS));
-        if (queryStats.getResourceWaitingTime() != null) {
-            assertEquals(queryStats.getResourceWaitingTime(), new Duration(0, MILLISECONDS));
-        }
-        if (queryStats.getTotalPlanningTime() != null) {
-            assertEquals(queryStats.getTotalPlanningTime(), new Duration(0, MILLISECONDS));
-        }
+        assertEquals(queryStats.getResourceWaitingTime(), new Duration(0, MILLISECONDS));
+        assertEquals(queryStats.getTotalPlanningTime(), new Duration(0, MILLISECONDS));
         assertEquals(queryStats.getExecutionTime(), new Duration(0, MILLISECONDS));
-        if (queryStats.getFinishingTime() != null) {
-            assertEquals(queryStats.getFinishingTime(), new Duration(0, MILLISECONDS));
-        }
+        assertEquals(queryStats.getFinishingTime(), new Duration(0, MILLISECONDS));
     }
 
     @Test
@@ -409,42 +403,10 @@ private static void assertState(QueryStateMachine stateMachine, QueryState expec
         QueryStats queryStats = queryInfo.getQueryStats();
         assertNotNull(queryStats.getElapsedTime());
         assertNotNull(queryStats.getQueuedTime());
+        assertNotNull(queryStats.getResourceWaitingTime());
         assertNotNull(queryStats.getExecutionTime());
-        if (queryInfo.getState() == QUEUED) {
-            assertNull(queryStats.getResourceWaitingTime());
-            assertNull(queryStats.getTotalPlanningTime());
-            assertNull(queryStats.getFinishingTime());
-        }
-        else if (queryInfo.getState() == WAITING_FOR_RESOURCES) {
-            assertNull(queryStats.getResourceWaitingTime());
-            assertNull(queryStats.getTotalPlanningTime());
-            assertNull(queryStats.getFinishingTime());
-        }
-        else if (queryInfo.getState() == PLANNING) {
-            assertNotNull(queryStats.getResourceWaitingTime());
-            assertNull(queryStats.getTotalPlanningTime());
-            assertNull(queryStats.getFinishingTime());
-        }
-        else if (queryInfo.getState() == STARTING) {
-            assertNotNull(queryStats.getResourceWaitingTime());
-            assertNotNull(queryStats.getTotalPlanningTime());
-            assertNull(queryStats.getFinishingTime());
-        }
-        else if (queryInfo.getState() == RUNNING) {
-            assertNotNull(queryStats.getResourceWaitingTime());
-            assertNotNull(queryStats.getTotalPlanningTime());
-            assertNull(queryStats.getFinishingTime());
-        }
-        else if (queryInfo.getState() == FINISHING) {
-            assertNotNull(queryStats.getResourceWaitingTime());
-            assertNotNull(queryStats.getTotalPlanningTime());
-            assertNull(queryStats.getFinishingTime());
-        }
-        else {
-            assertNotNull(queryStats.getResourceWaitingTime());
-            assertNotNull(queryStats.getTotalPlanningTime());
-            assertNotNull(queryStats.getFinishingTime());
-        }
+        assertNotNull(queryStats.getTotalPlanningTime());
+        assertNotNull(queryStats.getFinishingTime());
 
         assertNotNull(queryStats.getCreateTime());
         if (queryInfo.getState() == QUEUED || queryInfo.getState() == WAITING_FOR_RESOURCES) {
diff --git a/presto-product-tests/src/test/resources/com/facebook/presto/tests/querystats/single_query_info_response.json b/presto-product-tests/src/test/resources/com/facebook/presto/tests/querystats/single_query_info_response.json
index 51e3139e2e8b..4034be743728 100644
--- a/presto-product-tests/src/test/resources/com/facebook/presto/tests/querystats/single_query_info_response.json
+++ b/presto-product-tests/src/test/resources/com/facebook/presto/tests/querystats/single_query_info_response.json
@@ -27,10 +27,13 @@
     "lastHeartbeat": "2015-05-06T09:42:00.010Z",
     "endTime": "2015-05-05T16:01:17.125Z",
     "elapsedTime": "134.00ms",
+    "resourceWaitingTime": "11.00ms",
     "queuedTime": "2.11ms",
+    "executionTime": "13.00ms",
     "analysisTime": "7.47ms",
     "distributedPlanningTime": "311.77us",
     "totalPlanningTime": "9.99ms",
+    "finishingTime": "17.00ms",
     "totalTasks": 1,
     "runningTasks": 0,
     "completedTasks": 1,