Index: org.maven.ide.eclipse.wtp/src/org/maven/ide/eclipse/wtp/AbstractProjectConfiguratorDelegate.java
===================================================================
--- org.maven.ide.eclipse.wtp/src/org/maven/ide/eclipse/wtp/AbstractProjectConfiguratorDelegate.java	(revision 3540)
+++ org.maven.ide.eclipse.wtp/src/org/maven/ide/eclipse/wtp/AbstractProjectConfiguratorDelegate.java	(working copy)
@@ -54,7 +54,6 @@
   static final IClasspathAttribute NONDEPENDENCY_ATTRIBUTE = JavaCore.newClasspathAttribute(
       IClasspathDependencyConstants.CLASSPATH_COMPONENT_NON_DEPENDENCY, "");

-
   protected final MavenProjectManager projectManager;

   protected final IMavenMarkerManager mavenMarkerManager;
@@ -63,19 +62,21 @@
     this.projectManager = MavenPlugin.getDefault().getMavenProjectManager();
     this.mavenMarkerManager = MavenPlugin.getDefault().getMavenMarkerManager();
   }
-
-  public void configureProject(IProject project, MavenProject mavenProject, IProgressMonitor monitor) throws MarkedException {
+
+  public void configureProject(IProject project, MavenProject mavenProject, IProgressMonitor monitor)
+      throws MarkedException {
     try {
       mavenMarkerManager.deleteMarkers(project);
       configure(project, mavenProject, monitor);
-    } catch (CoreException cex) {
+    } catch(CoreException cex) {
       //TODO Filter out constraint violations
       mavenMarkerManager.addErrorMarkers(project, cex);
-      throw new MarkedException("Unable to configure "+project.getName(), cex);
+      throw new MarkedException("Unable to configure " + project.getName(), cex);
     }
   }
-
-  protected abstract void configure(IProject project, MavenProject mavenProject, IProgressMonitor monitor) throws CoreException;
+
+  protected abstract void configure(IProject project, MavenProject mavenProject, IProgressMonitor monitor)
+      throws CoreException;

   protected List<IMavenProjectFacade> getWorkspaceDependencies(IProject project, MavenProject mavenProject) {
     Set<IProject> projects = new HashSet<IProject>();
@@ -84,19 +85,20 @@
     for(Artifact artifact : artifacts) {
       IMavenProjectFacade dependency = projectManager.getMavenProject(artifact.getGroupId(), artifact.getArtifactId(),
           artifact.getVersion());
-
-      if((Artifact.SCOPE_COMPILE.equals(artifact.getScope())
-          || Artifact.SCOPE_RUNTIME.equals(artifact.getScope())) //MNGECLIPSE-1578 Runtime dependencies should be deployed
+
+      if((Artifact.SCOPE_COMPILE.equals(artifact.getScope()) || Artifact.SCOPE_RUNTIME.equals(artifact.getScope())) //MNGECLIPSE-1578 Runtime dependencies should be deployed
           //TODO breaks classpath && !artifact.isOptional() //MNGECLIPSE-1119 optional projects shouldn't be deployed
-          && dependency != null && !dependency.getProject().equals(project) && dependency.getFullPath(artifact.getFile()) != null
-          && projects.add(dependency.getProject())) {
+          && dependency != null
+          && !dependency.getProject().equals(project)
+          && dependency.getFullPath(artifact.getFile()) != null && projects.add(dependency.getProject())) {
         dependencies.add(dependency);
       }
     }
     return dependencies;
   }

-  protected void configureWtpUtil(IProject project, MavenProject mavenProject, IProgressMonitor monitor) throws CoreException {
+  protected void configureWtpUtil(IProject project, MavenProject mavenProject, IProgressMonitor monitor)
+      throws CoreException {
     // Adding utility facet on JEE projects is not allowed
     if(WTPProjectsUtil.isJavaEEProject(project)) {
       return;
@@ -114,11 +116,11 @@
     }

     facetedProject.modify(actions, monitor);
-
+
     //MNGECLIPSE-904 remove tests folder links for utility jars
     //TODO handle modules in a parent pom (the following doesn't work)
     removeTestFolderLinks(project, mavenProject, monitor, "/");
-
+
     //Remove "library unavailable at runtime" warning.
     addContainerAttribute(project, NONDEPENDENCY_ATTRIBUTE, monitor);
   }
@@ -135,12 +137,22 @@
   protected void removeTestFolderLinks(IProject project, MavenProject mavenProject, IProgressMonitor monitor,
       String folder) throws CoreException {
     IVirtualComponent component = ComponentCore.createComponent(project);
-    if (component != null){
+    if(component != null) {
       IVirtualFolder jsrc = component.getRootFolder().getFolder(folder);
+      if(!jsrc.exists()) {
+        return;
+      }
+
       for(IPath location : MavenProjectUtils.getSourceLocations(project, mavenProject.getTestCompileSourceRoots())) {
+        if(!location.toFile().exists()) {
+          continue;
+        }
         jsrc.removeLink(location, 0, monitor);
       }
       for(IPath location : MavenProjectUtils.getResourceLocations(project, mavenProject.getTestResources())) {
+        if(!location.toFile().exists()) {
+          continue;
+        }
         jsrc.removeLink(location, 0, monitor);
       }
     }
@@ -150,7 +162,8 @@
   protected void addContainerAttribute(IProject project, IClasspathAttribute attribute, IProgressMonitor monitor)
       throws JavaModelException {
     IJavaProject javaProject = JavaCore.create(project);
-	if (javaProject == null) return;
+    if(javaProject == null)
+      return;
     IClasspathEntry[] cp = javaProject.getRawClasspath();
     for(int i = 0; i < cp.length; i++ ) {
       if(IClasspathEntry.CPE_CONTAINER == cp[i].getEntryKind()