diff --git a/mobile/android/base/awesomebar/AllPagesTab.java b/mobile/android/base/awesomebar/AllPagesTab.java
index ae08ec40278..f9f596a050e 100644
--- a/mobile/android/base/awesomebar/AllPagesTab.java
+++ b/mobile/android/base/awesomebar/AllPagesTab.java
@@ -151,9 +151,11 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
         if (cursor != null)
             cursor.close();
 
-        mHandler.removeMessages(MESSAGE_UPDATE_FAVICONS);
-        mHandler.removeMessages(MESSAGE_LOAD_FAVICONS);
-        mHandler = null;
+        if (mHandler != null) {
+            mHandler.removeMessages(MESSAGE_UPDATE_FAVICONS);
+            mHandler.removeMessages(MESSAGE_LOAD_FAVICONS);
+            mHandler = null;
+        }
     }
 
     public void filter(String searchTerm) {