diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4d1673d22b5..bdd1246f76b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-01  Jeroen Frijters  <jeroen@frijters.net>
+
+	* java/util/Timer.java
+	(run): Stop the queue if a task throws an exception.
+
 2005-03-31  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* javax/swing/text/JTextComponent.java (viewToModel): New method.
diff --git a/libjava/java/util/Timer.java b/libjava/java/util/Timer.java
index 3c7223b2782..364d5314a97 100644
--- a/libjava/java/util/Timer.java
+++ b/libjava/java/util/Timer.java
@@ -350,8 +350,9 @@ public class Timer
                   throw death;
                 }
 	      catch (Throwable t)
-		{		
-		  /* ignore all errors */
+		{
+		  // If an exception escapes, the Timer becomes invalid.
+                  queue.stop();
 		}
 	    }