diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/AttributeTaskMapper.java b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/AttributeTaskMapper.java
index a2df487..68bdd42 100644
--- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/AttributeTaskMapper.java
+++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/AttributeTaskMapper.java
@@ -104,7 +104,7 @@ public class AttributeTaskMapper implements ITaskContribution, ISupportResponse
 		attributes.put(name, value);
 	}
 
-	void setTaskData(TaskData taskData) {
+	public void setTaskData(TaskData taskData) {
 		this.taskData = taskData;
 	}
 
diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/DefaultSupportHandler.java b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/DefaultSupportHandler.java
index b9f462d..6566fa8 100644
--- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/DefaultSupportHandler.java
+++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/DefaultSupportHandler.java
@@ -65,14 +65,18 @@ public class DefaultSupportHandler extends AbstractSupportHandler {
 		IStatus contribution = response.getStatus();
 		TaskData taskData = response.getTaskData();
 		if (contribution instanceof ProductStatus) {
-			AbstractRepositoryConnector connector = TasksUi.getRepositoryConnector(taskData.getConnectorKind());
-			ITaskMapping mapping = connector.getTaskMapping(taskData);
-			mapping.merge(new TaskMapping() {
-				@Override
-				public String getSeverity() {
-					return "enhancement"; //$NON-NLS-1$
+			if (response instanceof AttributeTaskMapper) {
+				if (((AttributeTaskMapper) response).getAttribute("severity") == null) {
+					AbstractRepositoryConnector connector = TasksUi.getRepositoryConnector(taskData.getConnectorKind());
+					ITaskMapping mapping = connector.getTaskMapping(taskData);
+					mapping.merge(new TaskMapping() {
+						@Override
+						public String getSeverity() {
+							return "enhancement"; //$NON-NLS-1$
+						}
+					});
 				}
-			});
+			}
 		}
 		if (response.getProduct() != null) {
 			IBundleGroup bundleGroup = ((SupportProduct) response.getProduct()).getBundleGroup();