diff --git a/core/java/com/android/internal/widget/ScrollingTabContainerView.java b/core/java/com/android/internal/widget/ScrollingTabContainerView.java
index c7d37f2..5b4d7ab 100644
--- a/core/java/com/android/internal/widget/ScrollingTabContainerView.java
+++ b/core/java/com/android/internal/widget/ScrollingTabContainerView.java
@@ -236,8 +236,9 @@
                     }
                     mTextView.setText(text);
                     mTextView.setVisibility(VISIBLE);
-                } else {
+                } else if (mTextView != null) {
                     mTextView.setVisibility(GONE);
+                    mTextView.setText(null);
                 }
             }
         }