From 70af6cc37eeeaea33888126772dbe56461726c22 Mon Sep 17 00:00:00 2001
From: Roman Timashev <tmshv@yandex-team.ru>
Date: Tue, 7 Nov 2017 01:12:32 +0300
Subject: [PATCH] [www] core Config stability improvements. Config::findConfig
 always returns an instance of Config

---
 src/core/Config.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/Config.js b/src/core/Config.js
index 64f3352d..bb900cc9 100644
--- a/src/core/Config.js
+++ b/src/core/Config.js
@@ -7,7 +7,8 @@ class Config {
 	}
 
 	static async findConfig() {
-		return Config.findById('settings')
+		const config = await Config.findById('settings')
+		return config || new Config({})
 	}
 
 	static async findById(id) {
@@ -26,8 +27,9 @@ class Config {
 		this.articleCardDefaultPreview = data.articleCardDefaultPreview
 		this.collectiveImage = data.collectiveImage
 
+		const redirect = data.redirect || {}
 		this.redirect = new Map(Object
-			.entries(data.redirect)
+			.entries(redirect)
 		)
 	}
 }