diff --git a/AppKit/CPControl.j b/AppKit/CPControl.j
index db8a22cd9..6310a9b11 100644
--- a/AppKit/CPControl.j
+++ b/AppKit/CPControl.j
@@ -337,9 +337,19 @@ var CPControlBlackColor     = [CPColor blackColor];
 
     [self highlight:YES];
     [self setState:[self nextState]];
-    [self sendAction:[self action] to:[self target]];
 
-    [CPTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(unhighlightButtonTimerDidFinish:) userInfo:nil repeats:NO];
+    try
+    {
+        [self sendAction:[self action] to:[self target]];
+    }
+    catch (e)
+    {
+        throw e;
+    }
+    finally
+    {
+        [CPTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(unhighlightButtonTimerDidFinish:) userInfo:nil repeats:NO];
+    }
 }
 
 - (void)unhighlightButtonTimerDidFinish:(id)sender
diff --git a/Tests/Manual/CPControlPerformClickExceptionTest/AppController.j b/Tests/Manual/CPControlPerformClickExceptionTest/AppController.j
new file mode 100644
index 000000000..fc07ffc5b
--- /dev/null
+++ b/Tests/Manual/CPControlPerformClickExceptionTest/AppController.j
@@ -0,0 +1,110 @@
+/*
+ * AppController.j
+ * CPControlPerformClickExceptionTest
+ *
+ * Created by Aparajita Fishman on August 21, 2010.
+ */
+
+@import <Foundation/CPObject.j>
+
+CPLogRegister(CPLogConsole);
+
+var UseFix = NO;
+
+
+@implementation AppController : CPObject
+{
+    CPWindow    theWindow;
+
+    CPButton    button;
+}
+
+- (void)applicationDidFinishLaunching:(CPNotification)aNotification
+{
+    theWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(70.0, 70.0, 400.0, 300.0) styleMask:CPTitledWindowMask];
+    [theWindow setTitle:@"CPControlPerformClickExceptionTest"];
+
+    var contentView = [theWindow contentView],
+        label = [CPTextField labelWithTitle:@"Press the Return key to see the problem and fix"],
+        button = [MyButton buttonWithTitle:@"Button"],
+        checkbox = [CPCheckBox checkBoxWithTitle:@"Use Fix"];
+
+    [label setFrameOrigin:CGPointMake(50, 50)];
+    [contentView addSubview:label];
+
+    [button setFrameOrigin:CGPointMake(50, 90)];
+    [button setTarget:self];
+    [button setAction:@selector(buttonWasPressed:)];
+    [contentView addSubview:button];
+
+    [checkbox setFrameOrigin:CGPointMake(50, 130)];
+    [checkbox setTarget:self];
+    [checkbox setAction:@selector(useFix:)];
+    [contentView addSubview:checkbox];
+
+    [theWindow setDefaultButton:button];
+    [theWindow orderFront:nil];
+}
+
+- (void)buttonWasPressed:(id)sender
+{
+    try
+    {
+        [CPException raise:[[sender window] title] reason:[sender title]];
+    }
+    finally
+    {
+        var alert = [[CPAlert alloc] init];
+
+        [alert setTitle:@"Test"];
+        [alert setMessageText:UseFix ? @"Note the button has already been unhighlighted." : @"Note the button has not been unhighlighted. It will be when this alert is closed."];
+        [alert addButtonWithTitle:@"OK"];
+        [alert setDelegate:self];
+        [alert runModal];
+    }
+}
+
+-(void)alertDidEnd:(CPAlert)theAlert returnCode:(int)returnCode
+{
+    [button highlight:NO];
+}
+
+- (void)useFix:(id)sender
+{
+    UseFix = [sender state] == CPOnState;
+}
+
+@end
+
+@implementation MyButton : CPButton
+
++ (id)buttonWithTitle:(CPString)aTitle
+{
+    var button = [[[self class] alloc] init];
+
+    [button setTheme:[CPTheme defaultTheme]];
+    [button setTitle:aTitle];
+    [button sizeToFit];
+
+    return button;
+}
+
+- (void)performClick:(id)sender
+{
+    if (UseFix)
+    {
+        [super performClick:sender];
+        return;
+    }
+
+    if (![self isEnabled])
+        return;
+
+    [self highlight:YES];
+    [self setState:[self nextState]];
+    [self sendAction:[self action] to:[self target]];
+
+    [CPTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(unhighlightButtonTimerDidFinish:) userInfo:nil repeats:NO];
+}
+
+@end
diff --git a/Tests/Manual/CPControlPerformClickExceptionTest/Info.plist b/Tests/Manual/CPControlPerformClickExceptionTest/Info.plist
new file mode 100644
index 000000000..d698a875a
--- /dev/null
+++ b/Tests/Manual/CPControlPerformClickExceptionTest/Info.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CPApplicationDelegateClass</key>
+    <string>AppController</string>
+    <key>CPBundleName</key>
+    <string>CPControlPerformClickExceptionTest</string>
+    <key>CPPrincipalClass</key>
+    <string>CPApplication</string>
+</dict>
+</plist>
diff --git a/Tests/Manual/CPControlPerformClickExceptionTest/Resources/spinner.gif b/Tests/Manual/CPControlPerformClickExceptionTest/Resources/spinner.gif
new file mode 100644
index 000000000..06dbc2bc2
Binary files /dev/null and b/Tests/Manual/CPControlPerformClickExceptionTest/Resources/spinner.gif differ
diff --git a/Tests/Manual/CPControlPerformClickExceptionTest/index-debug.html b/Tests/Manual/CPControlPerformClickExceptionTest/index-debug.html
new file mode 100644
index 000000000..dcc825c28
--- /dev/null
+++ b/Tests/Manual/CPControlPerformClickExceptionTest/index-debug.html
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns = "http://www.w3.org/1999/xhtml" xml:lang = "en" lang = "en">
+<!--
+ index-debug.html
+ TableCibTest
+
+ Created by Francisco Tolmasky on July 5, 2009.
+ Copyright 2009, 280 North, Inc. All rights reserved.
+-->
+    <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+
+        <title>CPControlPerformClickExceptionTest</title>
+
+        <script type = "text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
+        </script>
+
+        <script src = "Frameworks/Debug/Objective-J/Objective-J.js" type = "text/javascript"></script>
+
+        <style type = "text/css">
+            body{margin:0; padding:0;}
+            #container {position: absolute; top:50%; left:50%;}
+            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
+            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
+            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
+        </style>
+
+        <!--[if lt IE 7]>
+        <STYLE type="text/css">
+            #container { position: relative; top: 50%; }
+            #content { position: relative;}
+        </STYLE>
+        <![endif]-->
+
+    </head>
+
+    <body style="">
+        <div id="loadingcontainer" style=" background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
+            <script type = "text/javascript">
+                document.write("<div id='container'><p id='content'>" +
+                               "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
+                               "Loading CPControlPerformClickExceptionTest...</p></div>");
+            </script>
+
+            <noscript>
+                <div id="container">
+                    <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
+                        <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
+                        <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
+                            <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
+                            <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                            <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                            <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                            <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                        </ul>
+                    </div>
+                </div>
+            </noscript>
+        </div>
+    </body>
+
+</html>
diff --git a/Tests/Manual/CPControlPerformClickExceptionTest/index.html b/Tests/Manual/CPControlPerformClickExceptionTest/index.html
new file mode 100644
index 000000000..bd9ab5680
--- /dev/null
+++ b/Tests/Manual/CPControlPerformClickExceptionTest/index.html
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns = "http://www.w3.org/1999/xhtml" xml:lang = "en" lang = "en">
+<!--
+ index.html
+ TableCibTest
+
+ Created by Francisco Tolmasky on July 5, 2009.
+ Copyright 2009, 280 North, Inc. All rights reserved.
+-->
+    <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+
+        <title>CPControlPerformClickExceptionTest</title>
+
+        <script type = "text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+        </script>
+
+        <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
+
+        <style type = "text/css">
+            body{margin:0; padding:0;}
+            #container {position: absolute; top:50%; left:50%;}
+            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
+            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
+            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
+        </style>
+
+        <!--[if lt IE 7]>
+        <STYLE type="text/css">
+            #container { position: relative; top: 50%; }
+            #content { position: relative;}
+        </STYLE>
+        <![endif]-->
+
+    </head>
+
+    <body style="">
+        <div id="loadingcontainer" style=" background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
+            <script type = "text/javascript">
+                document.write("<div id='container'><p id='content'>" +
+                               "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
+                               "Loading CPControlPerformClickExceptionTest...</p></div>");
+            </script>
+
+            <noscript>
+                <div id="container">
+                    <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
+                        <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
+                        <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
+                            <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
+                            <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                            <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                            <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                            <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                        </ul>
+                    </div>
+                </div>
+            </noscript>
+        </div>
+    </body>
+
+</html>
diff --git a/Tests/Manual/CPControlPerformClickExceptionTest/main.j b/Tests/Manual/CPControlPerformClickExceptionTest/main.j
new file mode 100755
index 000000000..af6279da3
--- /dev/null
+++ b/Tests/Manual/CPControlPerformClickExceptionTest/main.j
@@ -0,0 +1,18 @@
+/*
+ * AppController.j
+ * TableCibTest
+ *
+ * Created by Francisco Tolmasky on July 5, 2009.
+ * Copyright 2009, 280 North, Inc. All rights reserved.
+ */
+
+@import <Foundation/Foundation.j>
+@import <AppKit/AppKit.j>
+
+@import "AppController.j"
+
+
+function main(args, namedArgs)
+{
+    CPApplicationMain(args, namedArgs);
+}