diff --git a/src/main/java/com/metaweb/gridworks/ProjectManager.java b/src/main/java/com/metaweb/gridworks/ProjectManager.java
index a710b4ee5..2116f368f 100644
--- a/src/main/java/com/metaweb/gridworks/ProjectManager.java
+++ b/src/main/java/com/metaweb/gridworks/ProjectManager.java
@@ -309,14 +309,20 @@ public class ProjectManager implements Serializable {
     }
 
     public boolean deleteProject(Project project) {
-        File file = new File(_dir, project.id + ".project");
-        if (file.exists()) {
-            _projects.remove(project.id);
-            _projectsMetadata.remove(project.id);
-            boolean result = file.delete();
-            save();
-            return result;
-        }
-        return false;
+    	if (_projectsMetadata.containsKey(project.id)) {
+	        _projects.remove(project.id);
+	        _projectsMetadata.remove(project.id);
+	        
+	        File file = new File(_dir, project.id + ".project");
+	        if (file.exists()) {
+	            file.delete();
+	        }
+	        
+	        save();
+	        
+	        return true;
+    	} else {
+    		return false;
+    	}
     }
 }