diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/BuildWorkspaceHandler.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/BuildWorkspaceHandler.java
index 91b8354732..4bd10c12a8 100644
--- a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/BuildWorkspaceHandler.java
+++ b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/BuildWorkspaceHandler.java
@@ -56,7 +56,7 @@ public BuildWorkspaceStatus buildWorkspace(boolean forceReBuild, IProgressMonito
 			if (monitor.isCanceled()) {
 				return BuildWorkspaceStatus.CANCELLED;
 			}
-			if (ProjectUtils.getAllProjects(false).length == 0) {
+			if (ProjectsManager.getDefaultProject().exists()) {
 				ProjectsManager.cleanupResources(ProjectsManager.getDefaultProject());
 			}
 			if (forceReBuild) {
@@ -166,8 +166,9 @@ protected IBuildConfiguration[] getBuildConfigurationsToBuild(Collection<IProjec
 	 *   <code>false</code> if not, or if this couldn't be determined
 	 */
 	protected boolean hasBuilder(IProject project) {
-		if (!project.isAccessible())
+		if (!project.isAccessible()) {
 			return false;
+		}
 		try {
 			ICommand[] commands = project.getDescription().getBuildSpec();
 			if (commands.length > 0) {