diff --git a/java/runtime/src/main/java/org/ray/runtime/gcs/GcsClient.java b/java/runtime/src/main/java/org/ray/runtime/gcs/GcsClient.java
index 647b77e33..7439dfa43 100644
--- a/java/runtime/src/main/java/org/ray/runtime/gcs/GcsClient.java
+++ b/java/runtime/src/main/java/org/ray/runtime/gcs/GcsClient.java
@@ -76,13 +76,13 @@ public class GcsClient {
         NodeInfo nodeInfo = new NodeInfo(
             clientId, data.nodeManagerAddress(), true, resources);
         clients.put(clientId, nodeInfo);
-      } else if (data.entryType() == EntryType.RES_CREATEUPDATE){
+      } else if (data.entryType() == EntryType.RES_CREATEUPDATE) {
         Preconditions.checkState(clients.containsKey(clientId));
         NodeInfo nodeInfo = clients.get(clientId);
         for (int i = 0; i < data.resourcesTotalLabelLength(); i++) {
           nodeInfo.resources.put(data.resourcesTotalLabel(i), data.resourcesTotalCapacity(i));
         }
-      } else if (data.entryType() == EntryType.RES_DELETE){
+      } else if (data.entryType() == EntryType.RES_DELETE) {
         Preconditions.checkState(clients.containsKey(clientId));
         NodeInfo nodeInfo = clients.get(clientId);
         for (int i = 0; i < data.resourcesTotalLabelLength(); i++) {
diff --git a/java/runtime/src/main/java/org/ray/runtime/runner/worker/DefaultWorker.java b/java/runtime/src/main/java/org/ray/runtime/runner/worker/DefaultWorker.java
index 6fd3ea0e7..211411906 100644
--- a/java/runtime/src/main/java/org/ray/runtime/runner/worker/DefaultWorker.java
+++ b/java/runtime/src/main/java/org/ray/runtime/runner/worker/DefaultWorker.java
@@ -15,6 +15,9 @@ public class DefaultWorker {
   public static void main(String[] args) {
     try {
       System.setProperty("ray.worker.mode", "WORKER");
+      Thread.setDefaultUncaughtExceptionHandler((Thread t, Throwable e) -> {
+        LOGGER.error("Uncaught worker exception in thread {}: {}", t, e);
+      });
       Ray.init();
       LOGGER.info("Worker started.");
       ((AbstractRayRuntime)Ray.internal()).loop();