diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs
index aff68b55ea..84db6cd3e7 100644
--- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs
+++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs
@@ -218,6 +218,10 @@ namespace ICSharpCode.FormsDesigner
 		static IProject FindProjectContainingType(string type)
 		{
 			IProject currentProject = ProjectService.CurrentProject;
+			if (currentProject == null) {
+				return null;
+			}
+			
 			foreach (IProject project in ProjectService.OpenSolution.Projects) {
 				if (project != currentProject) {
 					IProjectContent projectContent = ParserService.GetProjectContent(project);