diff --git a/pkg/commands/git_commands/worktree_loader.go b/pkg/commands/git_commands/worktree_loader.go
index a6561a78a..0c863d546 100644
--- a/pkg/commands/git_commands/worktree_loader.go
+++ b/pkg/commands/git_commands/worktree_loader.go
@@ -8,6 +8,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/common"
+	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"
 )
 
@@ -27,13 +28,13 @@ func NewWorktreeLoader(
 }
 
 func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) {
-	cmdArgs := NewGitCmd("worktree").Arg("list", "--porcelain", "-z").ToArgv()
+	cmdArgs := NewGitCmd("worktree").Arg("list", "--porcelain").ToArgv()
 	worktreesOutput, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
 	if err != nil {
 		return nil, err
 	}
 
-	splitLines := strings.Split(worktreesOutput, "\x00")
+	splitLines := utils.SplitLines(worktreesOutput)
 
 	var worktrees []*models.Worktree
 	var current *models.Worktree
diff --git a/pkg/gui/controllers/helpers/refresh_helper.go b/pkg/gui/controllers/helpers/refresh_helper.go
index ffbd85a59..78194e876 100644
--- a/pkg/gui/controllers/helpers/refresh_helper.go
+++ b/pkg/gui/controllers/helpers/refresh_helper.go
@@ -605,7 +605,9 @@ func (self *RefreshHelper) refreshWorktrees() error {
 
 	worktrees, err := self.c.Git().Loaders.Worktrees.GetWorktrees()
 	if err != nil {
-		return self.c.Error(err)
+		self.c.Log.Error(err)
+		self.c.Model().Worktrees = []*models.Worktree{}
+		return nil
 	}
 
 	self.c.Model().Worktrees = worktrees