diff --git a/presto-main/src/main/java/com/facebook/presto/server/ThreadResource.java b/presto-main/src/main/java/com/facebook/presto/server/ThreadResource.java
index <HASH>..<HASH> 100644
--- a/presto-main/src/main/java/com/facebook/presto/server/ThreadResource.java
+++ b/presto-main/src/main/java/com/facebook/presto/server/ThreadResource.java
@@ -43,6 +43,9 @@ public class ThreadResource
 
         ImmutableList.Builder<Info> builder = ImmutableList.builder();
         for (ThreadInfo info : mbean.getThreadInfo(mbean.getAllThreadIds(), Integer.MAX_VALUE)) {
+            if (info == null) {
+                continue;
+            }
             builder.add(new Info(
                     info.getThreadId(),
                     info.getThreadName(),
fix for thread listing under heavy workloads