diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index 72d4203f3..f42ed59c5 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -353,7 +353,7 @@ public class FolderList extends K9ListActivity
 
     @Override public Object onRetainNonConfigurationInstance()
     {
-        return mAdapter.mFolders;
+        return (mAdapter == null) ? null : mAdapter.mFolders;
     }
 
     @Override public void onPause()