diff --git a/src/com/android/settings/ManageApplications.java b/src/com/android/settings/ManageApplications.java
index dbbd249e8f9..1595de14838 100644
--- a/src/com/android/settings/ManageApplications.java
+++ b/src/com/android/settings/ManageApplications.java
@@ -1459,8 +1459,12 @@ public class ManageApplications extends ListActivity implements
     public void onStop() {
         super.onStop();
         // Stop the background threads
-        mResourceThread.setAbort();
-        mSizeComputor.setAbort();
+        if (mResourceThread != null) {
+            mResourceThread.setAbort();
+        }
+        if (mSizeComputor != null) {
+            mSizeComputor.setAbort();
+        }
         // clear all messages related to application list
         clearMessagesInHandler();
         // register receiver here