diff --git a/astrid/.classpath b/astrid/.classpath
index 24a48e061..120d63f4f 100644
--- a/astrid/.classpath
+++ b/astrid/.classpath
@@ -4,7 +4,6 @@
 	<classpathentry kind="src" path="src-legacy"/>
 	<classpathentry kind="src" path="api-src"/>
 	<classpathentry kind="src" path="common-src"/>
-	<classpathentry kind="src" path="external-src"/>
 	<classpathentry kind="src" path="plugin-src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
diff --git a/astrid/src-legacy/com/timsu/astrid/utilities/TasksXmlExporter.java b/astrid/src-legacy/com/timsu/astrid/utilities/TasksXmlExporter.java
index 2d2b8fa0e..cd4f67ba1 100644
--- a/astrid/src-legacy/com/timsu/astrid/utilities/TasksXmlExporter.java
+++ b/astrid/src-legacy/com/timsu/astrid/utilities/TasksXmlExporter.java
@@ -71,6 +71,8 @@ public class TasksXmlExporter {
             throws IOException {
         LinkedList<TagIdentifier> tags = tagController.getTaskTags(task);
         for (TagIdentifier tag : tags) {
+            if(!tagMap.containsKey(tag) || tagMap.get(tag) == null)
+                continue;
             xml.startTag(null, TAG_TAG);
             xml.attribute(null, TAG_ATTR_NAME, tagMap.get(tag).toString());
             xml.endTag(null, TAG_TAG);
diff --git a/tests/.classpath b/tests/.classpath
index 8a84e1a23..1f0940313 100644
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/astrid-3.x"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/astrid"/>
 	<classpathentry kind="output" path="ecbuild"/>
 </classpath>