diff --git a/src/com/fsck/k9/search/LocalSearch.java b/src/com/fsck/k9/search/LocalSearch.java
index 83c5fb522..0ffd3b488 100644
--- a/src/com/fsck/k9/search/LocalSearch.java
+++ b/src/com/fsck/k9/search/LocalSearch.java
@@ -385,6 +385,6 @@ public class LocalSearch implements SearchSpecification {
         mPredefined = (in.readByte() == 1);
         mAccountUuids.addAll(in.createStringArrayList());
         mConditions = in.readParcelable(LocalSearch.class.getClassLoader());
-        mLeafSet = mConditions.getLeafSet();
+        mLeafSet = (mConditions == null) ? null : mConditions.getLeafSet();
     }
 }
\ No newline at end of file