1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 457b1c47..454b25a8 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -754,6 +754,12 @@ public class Controller
     /* package */ Bundle createSaveState() {
         Bundle saveState = new Bundle();
         mTabControl.saveState(saveState);
+        // This method is called multiple times.Need to
+        // guard against TabControl not having any tabs
+        // during the destroy cycles which looses all the
+        // existing saved information.
+        if (saveState.isEmpty())
+           return null;
         return saveState;
     }