diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java
index 43c0ef1a5..1c5424fcc 100644
--- a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java
+++ b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java
@@ -20,6 +20,7 @@ import android.content.res.Resources;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.WindowManager.BadTokenException;
 
 import com.google.ical.values.RRule;
 import com.timsu.astrid.R;
@@ -99,9 +100,13 @@ public class TasksXmlImporter {
         progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
         progressDialog.setCancelable(false);
         progressDialog.setIndeterminate(true);
-        progressDialog.show();
-        if(context instanceof Activity)
-            progressDialog.setOwnerActivity((Activity)context);
+        try {
+            progressDialog.show();
+            if(context instanceof Activity)
+                progressDialog.setOwnerActivity((Activity)context);
+        } catch (BadTokenException e) {
+            // Running from a unit test or some such thing
+        }
 
         new Thread(new Runnable() {
             @Override
diff --git a/tests/src/com/todoroo/andlib/utility/TitleParserTest.java b/tests/src/com/todoroo/andlib/utility/TitleParserTest.java
index 06c25fa8b..76da07724 100644
--- a/tests/src/com/todoroo/andlib/utility/TitleParserTest.java
+++ b/tests/src/com/todoroo/andlib/utility/TitleParserTest.java
@@ -171,7 +171,7 @@ public class TitleParserTest extends DatabaseTestCase {
         task.setValue(Task.TITLE, "Jog tomorrow");
         taskService.quickAdd(task);
         date = new Date(task.getValue(Task.DUE_DATE));
-        assertEquals(date.getDay()+1, today.get(Calendar.DAY_OF_WEEK)+1);
+        assertEquals(date.getDay()+1 % 7, today.get(Calendar.DAY_OF_WEEK)+1 % 7);
 
         String[] days = {
                 "sunday",