diff --git a/repository/git.go b/repository/git.go
index d4560805754e85ce27c67f49da2351f3bf48d65a..1eb3b8b58d42c180ee900b6cab6195be0fb3d6e7 100644
--- a/repository/git.go
+++ b/repository/git.go
@@ -197,9 +197,12 @@ func (repo *GitRepo) GetRemotes() (map[string]string, error) {
 	remotes := make(map[string]string, len(lines))
 
 	for _, line := range lines {
+		if strings.TrimSpace(line) == "" {
+			continue
+		}
 		elements := strings.Fields(line)
 		if len(elements) != 3 {
-			return nil, fmt.Errorf("unexpected output format: %s", line)
+			return nil, fmt.Errorf("git remote: unexpected output format: %s", line)
 		}
 
 		remotes[elements[0]] = elements[1]