Added null checks while doing search on store.