2 files changed, 9 insertions, 6 deletions

diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractQueryHit.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractQueryHit.java
index 294a84b12..63398eb6a 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractQueryHit.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractQueryHit.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.mylar.tasks.core;
 
+import org.eclipse.mylar.tasks.core.Task.PriorityLevel;
+
 
 /**
  * @author Mik Kersten
@@ -24,7 +26,7 @@ public abstract class AbstractQueryHit implements ITaskListElement {
 
 	protected String description;
 
-	protected String priority;
+	protected String priority = PriorityLevel.getDefault().toString();
 
 	protected String id;
 	
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/Task.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/Task.java
index 921c7d209..df32f0e2c 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/Task.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/Task.java
@@ -65,8 +65,6 @@ public class Task implements ITask {
 		}
 
 		public static PriorityLevel fromString(String string) {
-			if (string == null)
-				return null;
 			if (string.equals("P1"))
 				return P1;
 			if (string.equals("P2"))
@@ -77,7 +75,7 @@ public class Task implements ITask {
 				return P4;
 			if (string.equals("P5"))
 				return P5;
-			return P3;
+			return getDefault();
 		}
 
 		public static PriorityLevel fromDescription(String string) {
@@ -93,9 +91,12 @@ public class Task implements ITask {
 				return P4;
 			if (string.equals("Very Low"))
 				return P5;
-			return null;
+			return getDefault();
 		}
 
+		public static PriorityLevel getDefault() {
+			return P3;
+		}
 	}
 
 	private boolean active = false;
@@ -108,7 +109,7 @@ public class Task implements ITask {
 
 	private String description;
 
-	private String priority = PriorityLevel.P3.toString();
+	private String priority = PriorityLevel.getDefault().toString();
 
 	private String notes = "";