diff --git a/src/VisualStudio/CSharp/Test/ProjectSystemShim/LifetimeTests.cs b/src/VisualStudio/CSharp/Test/ProjectSystemShim/LifetimeTests.cs
index d2739665e0736f2aff89119aa69aa268004f6f97..7ae10f1caf3cb8b8c3d9bbdc56588e57f979406e 100644
--- a/src/VisualStudio/CSharp/Test/ProjectSystemShim/LifetimeTests.cs
+++ b/src/VisualStudio/CSharp/Test/ProjectSystemShim/LifetimeTests.cs
@@ -23,6 +23,8 @@ public void DisconnectingAProjectDoesNotLeak()
 
                 project.UseReference(p => p.Disconnect());
                 project.AssertReleased();
+
+                Assert.Empty(environment.Workspace.CurrentSolution.Projects);
             }
         }
     }
diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
index 5cc3260dd4c70d2d776f424bd75d744c49a504a9..965e5debc33ba0d319cc9534f9e6978477a6bf23 100644
--- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
+++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
@@ -1355,7 +1355,7 @@ protected internal override void OnProjectRemoved(ProjectId projectId)
                             _projectSystemNameToProjectsMap.Remove(projectName);
                         }
 
-                        return;
+                        break;
                     }
                 }