diff --git a/src/org/apache/cassandra/service/CassandraServer.java b/src/org/apache/cassandra/service/CassandraServer.java
index a32b108541..0d6c814e3a 100644
--- a/src/org/apache/cassandra/service/CassandraServer.java
+++ b/src/org/apache/cassandra/service/CassandraServer.java
@@ -853,6 +853,15 @@ public class CassandraServer extends FacebookBase implements Cassandra.Iface
 	public static void main(String[] args) throws Throwable
 	{
 		int port = DatabaseDescriptor.getThriftPort();
+
+        Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler()
+        {
+            public void uncaughtException(Thread t, Throwable e)
+            {
+                logger_.error("Fatal exception in thread " + t, e);
+            }
+        });
+
 		try
 		{
 			CassandraServer peerStorageServer = new CassandraServer();