diff --git a/ChangeLog b/ChangeLog
index 2efe7dfc8..ba298b611 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-01  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSApplication.m: (_NSAppKitUncaughtExceptionHandler)
+	Call [NSApp run] to re-enter runloop if we are told to ignore
+	the exception.  Not sure this is right though ... probably
+	the option to ign ore should be removed.
+
 2005-06-28  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSScrollView.m: ([-initWithFrame:) create a hidden horizontal
diff --git a/Headers/AppKit/NSRulerView.h b/Headers/AppKit/NSRulerView.h
index a131a686f..ae5f45258 100644
--- a/Headers/AppKit/NSRulerView.h
+++ b/Headers/AppKit/NSRulerView.h
@@ -54,7 +54,7 @@ typedef enum {
 {
   GSRulerUnit *_unit;
   NSScrollView *_scrollView;
-  NSView *_clientView;
+  NSView *_clientView;		// Not retained
   NSView *_accessoryView;
   float _originOffset;
   NSMutableArray *_markers;
diff --git a/Source/NSApplication.m b/Source/NSApplication.m
index a0c731f5f..bf2196625 100644
--- a/Source/NSApplication.m
+++ b/Source/NSApplication.m
@@ -136,6 +136,7 @@ _NSAppKitUncaughtExceptionHandler (NSException *exception)
   /* The user said to go on - more fun I guess - turn the AppKit
      exception handler on again */
   NSSetUncaughtExceptionHandler (_NSAppKitUncaughtExceptionHandler);
+  [NSApp run];	/* try entering the run loop again */
 }
 
 /* This is the bundle from where we load localization of messages.  */