diff --git a/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java
index 7077885..586f46d 100644
--- a/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java
+++ b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java
@@ -123,10 +123,12 @@
     static void removeOrphanedStates(Context context, int[] widgetIds) {
         File prefsDirectory = context.getSharedPrefsFile("null").getParentFile();
         File[] widgetStates = prefsDirectory.listFiles(new StateFilter(widgetIds));
-        for (File f : widgetStates) {
-            Log.w(TAG, "Found orphaned state: " + f.getName());
-            if (!f.delete()) {
-                f.deleteOnExit();
+        if (widgetStates != null) {
+            for (File f : widgetStates) {
+                Log.w(TAG, "Found orphaned state: " + f.getName());
+                if (!f.delete()) {
+                    f.deleteOnExit();
+                }
             }
         }
     }