diff --git a/src/com/android/launcher2/DeferredHandler.java b/src/com/android/launcher2/DeferredHandler.java
index 433bf5599b..ce60352c30 100644
--- a/src/com/android/launcher2/DeferredHandler.java
+++ b/src/com/android/launcher2/DeferredHandler.java
@@ -40,6 +40,9 @@ public class DeferredHandler {
         public void handleMessage(Message msg) {
             Runnable r;
             synchronized (mQueue) {
+                if (mQueue.size() == 0) {
+                    return;
+                }
                 r = mQueue.removeFirst();
             }
             r.run();
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 9191bc6658..37a244464a 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -266,17 +266,9 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag
         clearVacantCache();
         mCurrentScreen = Math.max(0, Math.min(currentScreen, getChildCount() - 1));
         scrollTo(mCurrentScreen * getWidth(), 0);
-        updateWallpaperOffset();
         invalidate();
     }
 
-    /**
-     * Shows the default screen (defined by the firstScreen attribute in XML.)
-     */
-    void showDefaultScreen() {
-        setCurrentScreen(mDefaultScreen);
-    }
-
     /**
      * Adds the specified child in the current screen. The position and dimension of
      * the child are defined by x, y, spanX and spanY.