diff --git a/android/clientbeta/AndroidManifest.xml b/android/clientbeta/AndroidManifest.xml
index ae009163..2918dce1 100644
--- a/android/clientbeta/AndroidManifest.xml
+++ b/android/clientbeta/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.tweetlanes.android.beta"
     android:versionCode="51"
-    android:versionName="1.2.1_b5">
+    android:versionName="1.2.1_b6">
 
 
 
diff --git a/android/libraries/TweetLanesCore/src/com/tweetlanes/android/core/view/TweetFeedFragment.java b/android/libraries/TweetLanesCore/src/com/tweetlanes/android/core/view/TweetFeedFragment.java
index 20c4f2dd..d3699df0 100644
--- a/android/libraries/TweetLanesCore/src/com/tweetlanes/android/core/view/TweetFeedFragment.java
+++ b/android/libraries/TweetLanesCore/src/com/tweetlanes/android/core/view/TweetFeedFragment.java
@@ -491,7 +491,10 @@ boolean configureCachedStatuses() {
 
                             setStatusFeed(_mCachedStatusFeed, false);
                             if (getStatusFeed() != null && mLastTwitterStatusIdSeen != null) {
-                                updateListHeading(getStatusFeed().getStatusIndex(mLastTwitterStatusIdSeen));
+                                Integer index = getStatusFeed().getStatusIndex(mLastTwitterStatusIdSeen);
+                                if(index != null){
+                                    updateListHeading(index);
+                                }
                             }
 
                             return true;