Index: Core/Common/src/Core.Common.Controls.Swf/ExceptionDialog.Designer.cs
===================================================================
diff -u -ra795ec78ef4456ab9c8ad42029eb744093dfc600 -re5980347a21cabde39653f8f41cb3fb08f91dfdc
--- Core/Common/src/Core.Common.Controls.Swf/ExceptionDialog.Designer.cs	(.../ExceptionDialog.Designer.cs)	(revision a795ec78ef4456ab9c8ad42029eb744093dfc600)
+++ Core/Common/src/Core.Common.Controls.Swf/ExceptionDialog.Designer.cs	(.../ExceptionDialog.Designer.cs)	(revision e5980347a21cabde39653f8f41cb3fb08f91dfdc)
@@ -87,8 +87,10 @@
             // 
             // ExceptionDialog
             // 
+            this.AcceptButton = this.buttonRestart;
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.buttonExit;
             this.Controls.Add(this.buttonOpenLog);
             this.Controls.Add(this.buttonExit);
             this.Controls.Add(this.exceptionTextBox);
Index: Core/Common/src/Core.Common.Controls.Swf/ExceptionDialog.cs
===================================================================
diff -u -ra795ec78ef4456ab9c8ad42029eb744093dfc600 -re5980347a21cabde39653f8f41cb3fb08f91dfdc
--- Core/Common/src/Core.Common.Controls.Swf/ExceptionDialog.cs	(.../ExceptionDialog.cs)	(revision a795ec78ef4456ab9c8ad42029eb744093dfc600)
+++ Core/Common/src/Core.Common.Controls.Swf/ExceptionDialog.cs	(.../ExceptionDialog.cs)	(revision e5980347a21cabde39653f8f41cb3fb08f91dfdc)
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
@@ -88,5 +89,15 @@
 
             return str;
         }
+
+        protected override void OnClosing(CancelEventArgs e)
+        {
+            if (ExitClicked != null)
+            {
+                ExitClicked(this, null);
+            }
+
+            base.OnClosing(e);
+        }
     }
 }
\ No newline at end of file