diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs
index 2d5891d3..4dac1b19 100644
--- a/source/Components/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs
+++ b/source/Components/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs
@@ -143,7 +143,9 @@ internal static void SetFocusOnLastElement( ILayoutElement model )
 
     private static void Current_Exit( object sender, ExitEventArgs e )
     {
-      Application.Current.Exit -= new ExitEventHandler( Current_Exit );
+      if (Application.Current != null)
+         Application.Current.Exit -= new ExitEventHandler(Current_Exit);
+
       if( _windowHandler != null )
       {
         _windowHandler.FocusChanged -= new EventHandler<FocusChangeEventArgs>( WindowFocusChanging );