diff --git a/cmd.go b/cmd.go
index 9b33bb93..4c96b877 100644
--- a/cmd.go
+++ b/cmd.go
@@ -199,9 +199,9 @@ func handleHelp() error {
 	if cmdArgs.op == "Y" || cmdArgs.op == "yay" {
 		usage()
 		return nil
-	} else {
-		return passToPacman(cmdArgs)
 	}
+
+	return passToPacman(cmdArgs)
 }
 
 //this function should only set config options
diff --git a/main.go b/main.go
index b69b44c1..0d47d241 100644
--- a/main.go
+++ b/main.go
@@ -148,7 +148,7 @@ func initAlpm() (err error) {
 		return
 	}
 
-	value, _, exists = cmdArgs.getArg("color")
+	value, _, _ = cmdArgs.getArg("color")
 	if value == "always" || value == "auto" {
 		useColor = true
 	} else if value == "never" {
diff --git a/vcs.go b/vcs.go
index c38dfcb1..c091efdc 100644
--- a/vcs.go
+++ b/vcs.go
@@ -152,11 +152,14 @@ func getCommit(url string, branch string, protocols []string) string {
 
 		err = cmd.Wait()
 		timer.Stop()
-
 		if err != nil {
 			continue
 		}
+
 		err = cmd.Run()
+		if err != nil {
+			continue
+		}
 
 		stdout := outbuf.String()
 		split := strings.Fields(stdout)