diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
index 563fd8ff9..90011a7b6 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
@@ -130,9 +130,11 @@ public class GtasksTaskListUpdater {
             root.children.add(target);
         } else {
             Node sibling = findNode(root, moveBeforeTaskId);
-            int index = sibling.parent.children.indexOf(sibling);
-            target.parent.children.remove(target);
-            sibling.parent.children.add(index, target);
+            if(sibling != null) {
+                int index = sibling.parent.children.indexOf(sibling);
+                target.parent.children.remove(target);
+                sibling.parent.children.add(index, target);
+            }
         }
 
         traverseTreeAndWriteValues(root, new AtomicInteger(0), -1);
diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionExposer.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionExposer.java
index 5895e4306..1381daee8 100644
--- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionExposer.java
@@ -38,6 +38,8 @@ public class TimerActionExposer extends BroadcastReceiver {
 
         Task task = PluginServices.getTaskService().fetchById(taskId, Task.ID, Task.TIMER_START,
                 Task.ELAPSED_SECONDS);
+        if(task == null)
+            return;
 
         // was part of a broadcast for actions
         if(AstridApiConstants.BROADCAST_REQUEST_ACTIONS.equals(intent.getAction())) {
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index dc638eabf..b9a20cf3f 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -763,7 +763,8 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         }
 
         public void onQuickActionClicked(QuickActionWidget widget, int position){
-            mBar.dismiss();
+            if(mBar != null)
+                mBar.dismiss();
             mBar = null;
 
             if(position == 0) {
diff --git a/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java b/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java
index 774bb184e..129026c5c 100644
--- a/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java
+++ b/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java
@@ -95,7 +95,11 @@ public class Astrid2TaskProvider extends ContentProvider {
 	}
 
 	public Astrid2TaskProvider() {
-	    DependencyInjectionService.getInstance().inject(this);
+	    try {
+	        DependencyInjectionService.getInstance().inject(this);
+	    } catch (Exception e) {
+	        // can't do anything about this
+	    }
     }
 
 	@Override
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
index 44ba6f489..bd5c42ce4 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
@@ -49,7 +49,11 @@ public class AstridPreferences {
 
 	/** CurrentVersion: the currently installed version of Astrid */
     public static int getCurrentVersion() {
-        return Preferences.getInt(P_CURRENT_VERSION, 0);
+        try {
+            return Preferences.getInt(P_CURRENT_VERSION, 0);
+        } catch (Exception e) {
+            return 0;
+        }
     }
 
     /** CurrentVersion: the currently installed version of Astrid */