diff --git a/src/com/timsu/astrid/activities/TaskList.java b/src/com/timsu/astrid/activities/TaskList.java
index 2f530cfa7..66c1f98c8 100644
--- a/src/com/timsu/astrid/activities/TaskList.java
+++ b/src/com/timsu/astrid/activities/TaskList.java
@@ -121,16 +121,16 @@ public class TaskList extends Activity {
 
         setupUIComponents();
 
+        Bundle variables = new Bundle();
+
         if(savedInstanceState != null && savedInstanceState.containsKey(LAST_ACTIVITY_TAG)) {
         	viewFlipper.setDisplayedChild(savedInstanceState.getInt(LAST_ACTIVITY_TAG));
-        	Bundle variables = savedInstanceState.getBundle(LAST_BUNDLE_TAG);
-        	getCurrentSubActivity().onDisplay(variables);
-        } else {
-            Bundle variables = null;
-            if(getIntent().hasExtra(VARIABLES_TAG))
-                variables = getIntent().getBundleExtra(VARIABLES_TAG);
-        	getCurrentSubActivity().onDisplay(variables);
+        	variables.putAll(savedInstanceState.getBundle(LAST_BUNDLE_TAG));
         }
+        if(getIntent().hasExtra(VARIABLES_TAG))
+            variables.putAll(getIntent().getBundleExtra(VARIABLES_TAG));
+
+        getCurrentSubActivity().onDisplay(variables);
 
         // sync now if requested
         if(synchronizeNow) {
diff --git a/src/com/timsu/astrid/activities/TaskModificationActivity.java b/src/com/timsu/astrid/activities/TaskModificationActivity.java
index f90435504..9d1a19176 100644
--- a/src/com/timsu/astrid/activities/TaskModificationActivity.java
+++ b/src/com/timsu/astrid/activities/TaskModificationActivity.java
@@ -46,10 +46,10 @@ public abstract class TaskModificationActivity<MODEL_TYPE extends
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        controller = new TaskController(this);
-        controller.open();
-
         try {
+            controller = new TaskController(this);
+            controller.open();
+
             // check if we have a TaskIdentifier
             TaskIdentifier identifier = null;
             Bundle extras = getIntent().getExtras();