diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/GridVisualizerWindow.xaml.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/GridVisualizerWindow.xaml.cs
index 7711edbb93..95ad3bd155 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/GridVisualizerWindow.xaml.cs
+++ b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/GridVisualizerWindow.xaml.cs
@@ -149,10 +149,10 @@ namespace Debugger.AddIn.Visualizers.GridVisualizer
 					this.columnHider = new GridViewColumnHider((GridView)this.listView.View);
 					cmbColumns.ItemsSource = this.columnHider.HideableColumns;
 				}
-			} catch (GetValueException ex) {
-				// TODO display ex msg
-			} catch (DebuggerVisualizerException ex) {
-				// TODO display ex msg
+			} catch (GetValueException) {
+				// display ex msg
+			} catch (DebuggerVisualizerException) {
+				// display ex msg
 			}
 		}
 		
diff --git a/src/Main/Base/Project/Src/Commands/FileTabStripCommands.cs b/src/Main/Base/Project/Src/Commands/FileTabStripCommands.cs
index e84d917c3c..550a392dee 100644
--- a/src/Main/Base/Project/Src/Commands/FileTabStripCommands.cs
+++ b/src/Main/Base/Project/Src/Commands/FileTabStripCommands.cs
@@ -80,13 +80,29 @@ namespace ICSharpCode.SharpDevelop.Commands.TabStrip
 	{
 		public override void Run()
 		{
-			var projectBrowser = (ProjectBrowserPad.Instance.Control as ProjectBrowserPanel).ProjectBrowserControl;
-			var fileName = ((IWorkbenchWindow)Owner).ActiveViewContent.PrimaryFileName;
-			if (fileName != null) {
+			var fileName = GetActiveFileName();
+			var projectBrowser = GetProjectBrowser();
+			if (fileName != null && projectBrowser != null) {
 				projectBrowser.SelectFileAndExpand(fileName);
 				projectBrowser.Focus();
 			}
 		}
+		
+		string GetActiveFileName()
+		{
+			if ((this.Owner is IWorkbenchWindow) && (((IWorkbenchWindow)this.Owner).ActiveViewContent != null)) {
+				return (Owner as IWorkbenchWindow).ActiveViewContent.PrimaryFileName;
+			}
+			return null;
+		}
+		
+		ProjectBrowserControl GetProjectBrowser()
+		{
+			if ((ProjectBrowserPad.Instance != null) && (ProjectBrowserPad.Instance.Control is ProjectBrowserPanel)) {
+				return (ProjectBrowserPad.Instance.Control as ProjectBrowserPanel).ProjectBrowserControl;
+			}
+			return null;
+		}
 	}
 	
 	/// <summary>