diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index e7d51271c..e49a8cc69 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.timsu.astrid"
-          android:versionName="3.6.1"
-          android:versionCode="167">
+          android:versionName="3.6.2"
+          android:versionCode="168">
           
   <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
   <!--    android:installLocation="internalOnly"> -->
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
index 6d9524dc1..ad3b766d2 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
@@ -171,13 +171,15 @@ public class FilterListActivity extends ExpandableListActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        adapter.registerRecevier();
+        if(adapter != null)
+            adapter.registerRecevier();
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        adapter.unregisterRecevier();
+        if(adapter != null)
+            adapter.unregisterRecevier();
     }
 
     /* ======================================================================
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index 294ada4ae..1820edf8b 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -888,8 +888,10 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         }
         name.setTextSize(fontSize);
         float detailTextSize = Math.max(12, fontSize * 14 / 20);
-        viewHolder.details.setTextSize(detailTextSize);
-        viewHolder.dueDate.setTextSize(detailTextSize);
+        if(viewHolder.details != null)
+            viewHolder.details.setTextSize(detailTextSize);
+        if(viewHolder.dueDate != null)
+            viewHolder.dueDate.setTextSize(detailTextSize);
     }
 
     /**
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index a83f7063b..ad7627257 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -19,6 +19,7 @@ import com.todoroo.astrid.utility.AstridPreferences;
 
 public final class UpgradeService {
 
+    public static final int V3_6_2 = 168;
     public static final int V3_6_0 = 166;
     public static final int V3_5_0 = 165;
     public static final int V3_4_0 = 162;
@@ -110,19 +111,26 @@ public final class UpgradeService {
             });
         } else {
             // current message
-            if(from < V3_6_0) {
+            if(from >= V3_6_0 && from < V3_6_2) {
+                newVersionString(changeLog, "3.6.2 (12/11/10)", new String[] {
+                        "Fix for Google Tasks crash on view list",
+                        "Fix for Producteev crash sometimes during sync",
+                });
+                upgrade3To3_6(context);
+            }
+
+            // old messages
+            if(from >= V3_0_0 && from < V3_6_0) {
                 newVersionString(changeLog, "3.6.0 (11/13/10)", new String[] {
                         "Astrid Power Pack is now launched to the Android Market. " +
-                            "New Power Pack features include 4x2 and 4x4 widgets and voice " +
-                            "task reminders and creation. Go to the add-ons page to find out more!",
+                        "New Power Pack features include 4x2 and 4x4 widgets and voice " +
+                        "task reminders and creation. Go to the add-ons page to find out more!",
                         "Fix for Google Tasks: due times got lost on sync, repeating tasks not repeated",
                         "Fix for task alarms not always firing if multiple set",
                         "Fix for various force closes",
                 });
                 upgrade3To3_6(context);
             }
-
-            // old messages
             if(from >= V3_0_0 && from < V3_5_0)
                 newVersionString(changeLog, "3.5.0 (10/25/10)", new String[] {
                         "Google Tasks Sync (beta!)",