diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 9007b58..d29fb35 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1013,10 +1013,14 @@
         private void updateOffset(boolean force) {
             if (mWaitingForUpdate || force) {
                 mWaitingForUpdate = false;
-                if (computeScrollOffset()) {
-                    mWallpaperManager.setWallpaperOffsets(mWindowToken,
-                            mWallpaperOffset.getCurrX(), 0.5f);
-                    setWallpaperOffsetSteps();
+                if (computeScrollOffset() && mWindowToken != null) {
+                    try {
+                        mWallpaperManager.setWallpaperOffsets(mWindowToken,
+                                mWallpaperOffset.getCurrX(), 0.5f);
+                        setWallpaperOffsetSteps();
+                    } catch (IllegalArgumentException e) {
+                        Log.e(TAG, "Error updating wallpaper offset: " + e);
+                    }
                 }
             }
         }