diff --git a/erpnext/projects/doctype/project/test_project.py b/erpnext/projects/doctype/project/test_project.py
index c3f56b8..ce56a50 100644
--- a/erpnext/projects/doctype/project/test_project.py
+++ b/erpnext/projects/doctype/project/test_project.py
@@ -106,17 +106,18 @@
 
 def make_project(args):
 	args = frappe._dict(args)
-	if args.project_template_name:
-		template = make_project_template(args.project_template_name)
 
 	project = frappe.get_doc(dict(
 		doctype = 'Project',
 		project_name = args.project_name,
 		status = 'Open',
-		project_template = template.name,
 		expected_start_date = args.start_date
 	))
 
+	if args.project_template_name:
+		template = make_project_template(args.project_template_name)
+		project.project_template = template.name
+
 	if not frappe.db.exists("Project", args.project_name):
 		project.insert()
 
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index 072a848..80b764b 100755
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -94,7 +94,7 @@
     def update_depends_on(self):
         depends_on_tasks = self.depends_on_tasks or ""
         for d in self.depends_on:
-            if d.task and not d.task in depends_on_tasks:
+            if d.task and d.task not in depends_on_tasks:
                 depends_on_tasks += d.task + ","
         self.depends_on_tasks = depends_on_tasks
 
@@ -180,7 +180,7 @@
     def populate_depends_on(self):
         if self.parent_task:
             parent = frappe.get_doc('Task', self.parent_task)
-            if not self.name in [row.task for row in parent.depends_on]:
+            if self.name not in [row.task for row in parent.depends_on]:
                 parent.append("depends_on", {
                     "doctype": "Task Depends On",
                     "task": self.name,
