diff --git a/pkg/cmd/grafana-cli/main.go b/pkg/cmd/grafana-cli/main.go
index 86eb6bc271a..a17de5603e0 100644
--- a/pkg/cmd/grafana-cli/main.go
+++ b/pkg/cmd/grafana-cli/main.go
@@ -66,7 +66,7 @@ func main() {
 
 func setupLogging() {
 	for _, f := range os.Args {
-		if f == "-D" || f == "--debug" || f == "-debug" {
+		if f == "-d" || f == "--debug" || f == "-debug" {
 			logger.SetDebug(true)
 		}
 	}
diff --git a/pkg/cmd/grafana-cli/services/services.go b/pkg/cmd/grafana-cli/services/services.go
index 338975bc130..8495aeea811 100644
--- a/pkg/cmd/grafana-cli/services/services.go
+++ b/pkg/cmd/grafana-cli/services/services.go
@@ -21,6 +21,7 @@ var (
 	IoHelper       m.IoUtil = IoUtilImp{}
 	HttpClient     http.Client
 	grafanaVersion string
+	NotFoundError  = errors.New("404 not found error")
 )
 
 func Init(version string, skipTLSVerify bool) {
@@ -126,10 +127,14 @@ func RemoveInstalledPlugin(pluginPath, pluginName string) error {
 }
 
 func GetPlugin(pluginId, repoUrl string) (m.Plugin, error) {
+	logger.Debugf("getting plugin metadata from: %v pluginId: %v \n", repoUrl, pluginId)
 	body, err := sendRequest(repoUrl, "repo", pluginId)
 
 	if err != nil {
-		logger.Info("Failed to send request", "error", err)
+		logger.Info("Failed to send request: ", err)
+		if err == NotFoundError {
+			return m.Plugin{}, fmt.Errorf("Failed to find requested plugin, check if the plugin_id is correct. error: %v", err)
+		}
 		return m.Plugin{}, fmt.Errorf("Failed to send request. error: %v", err)
 	}
 
@@ -169,6 +174,9 @@ func sendRequest(repoUrl string, subPaths ...string) ([]byte, error) {
 		return []byte{}, err
 	}
 
+	if res.StatusCode == 404 {
+		return []byte{}, NotFoundError
+	}
 	if res.StatusCode/100 != 2 {
 		return []byte{}, fmt.Errorf("Api returned invalid status: %s", res.Status)
 	}
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index c6c804b3cc8..89855e68287 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -770,7 +770,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
 
 	pluginsSection := iniFile.Section("plugins")
 	cfg.PluginsEnableAlpha = pluginsSection.Key("enable_alpha").MustBool(false)
-	cfg.PluginsAppsSkipVerifyTLS = iniFile.Section("plugins").Key("app_tls_skip_verify_insecure").MustBool(false)
+	cfg.PluginsAppsSkipVerifyTLS = pluginsSection.Key("app_tls_skip_verify_insecure").MustBool(false)
 
 	// check old location for this option
 	if panelsSection.Key("enable_alpha").MustBool(false) {