From 5dea0fda51fe0cc7ce1e2fdb17f2dabe16b7213f Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 18 Nov 2016 16:43:08 +0100
Subject: [PATCH] fix(settings): remove nil pointer exception

---
 pkg/setting/setting.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 94d93d3743e..ae20a4b881e 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -359,12 +359,12 @@ func loadConfiguration(args *CommandLineArgs) {
 	configFiles = append(configFiles, defaultConfigFile)
 
 	Cfg, err = ini.Load(defaultConfigFile)
-	Cfg.BlockMode = false
-
 	if err != nil {
 		log.Fatal(3, "Failed to parse defaults.ini, %v", err)
 	}
 
+	Cfg.BlockMode = false
+
 	// command line props
 	commandLineProps := getCommandLineProperties(args.Args)
 	// load default overrides