diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index a19eb4c..a521d67 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -1103,15 +1103,19 @@
                             public void run() {
                                 final long t = SystemClock.uptimeMillis();
                                 final Callbacks callbacks = tryGetCallbacks(oldCallbacks);
-                                if (first) {
-                                    mBeforeFirstLoad = false;
-                                    callbacks.bindAllApplications(added);
+                                if (callbacks != null) {
+                                    if (first) {
+                                        mBeforeFirstLoad = false;
+                                        callbacks.bindAllApplications(added);
+                                    } else {
+                                        callbacks.bindAppsAdded(added);
+                                    }
+                                    if (DEBUG_LOADERS) {
+                                        Log.d(TAG, "bound " + added.size() + " apps in "
+                                            + (SystemClock.uptimeMillis() - t) + "ms");
+                                    }
                                 } else {
-                                    callbacks.bindAppsAdded(added);
-                                }
-                                if (DEBUG_LOADERS) {
-                                    Log.d(TAG, "bound " + added.size() + " apps in "
-                                        + (SystemClock.uptimeMillis() - t) + "ms");
+                                    Log.i(TAG, "not binding apps: no Launcher activity");
                                 }
                             }
                         });