fix(config): error message for broken config file

closes #6731

CHANGELOG.md

@@ -7,6 +7,7 @@
 * **TLS Client Auth**: Support for TLS client authentication for datasource proxies [#2316](https://github.com/grafana/grafana/issues/2316)
 * **Alerts out of sync**: Saving dashboards with broken alerts causes sync problem[#6576](https://github.com/grafana/grafana/issues/6576)
 * **Alerting**: Saving an alert with condition "HAS NO DATA" throws an error[#6701](https://github.com/grafana/grafana/issues/6701)
+* **Config**: Improve error message when parsing broken config file [#6731](https://github.com/grafana/grafana/issues/6731)
 
 # 4.0-beta2 (2016-11-21)
 

pkg/setting/setting.go

@@ -325,11 +325,12 @@ func loadSpecifedConfigFile(configFile string) error {
 	}
 
 	userConfig, err := ini.Load(configFile)
-	userConfig.BlockMode = false
 	if err != nil {
 		return fmt.Errorf("Failed to parse %v, %v", configFile, err)
 	}
 
+	userConfig.BlockMode = false
+
 	for _, section := range userConfig.Sections() {
 		for _, key := range section.Keys() {
 			if key.Value() == "" {