diff --git a/.project b/.project
index 6cc92e801..a3142fce5 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>astrid-2.10.1</name>
+	<name>astrid-2.x</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3714703fa..a599e1474 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.timsu.astrid"
-      android:versionCode="122" android:versionName="2.10.1">
+      android:versionCode="123" android:versionName="2.10.2">
       
     <!-- ============================ Metadata ============================ -->   
       
diff --git a/src/com/timsu/astrid/sync/SynchronizationProvider.java b/src/com/timsu/astrid/sync/SynchronizationProvider.java
index d9fdf3a93..eca073e78 100644
--- a/src/com/timsu/astrid/sync/SynchronizationProvider.java
+++ b/src/com/timsu/astrid/sync/SynchronizationProvider.java
@@ -287,6 +287,10 @@ public abstract class SynchronizationProvider {
             TaskProxy localTask = new TaskProxy(getId(), mapping.getRemoteId());
             TaskModelForSync task = taskController.fetchTaskForSync(
                     mapping.getTask());
+            if(task == null) {
+                // sucks... task was deleted i guess.
+                continue;
+            }
             localTask.readFromTaskModel(task);
             localTask.readTagsFromController(task.getTaskIdentifier(),
                     tagController, data.tags);