Merge branch 'master' into patched-master

1 files changed, 1 insertions, 1 deletions

diff --git a/storage.c b/storage.c
index f1ea32a2..9e16c9e2 100644
--- a/storage.c
+++ b/storage.c
@@ -107,7 +107,7 @@ GList *storage_init(const char *primary, char **migrate)
 	register_storage_backend(&storage_xml);
 
 	storage = storage_init_single(primary);
-	if (storage == NULL && storage->save == NULL) {
+	if (storage == NULL || storage->save == NULL) {
 		return NULL;
 	}