diff --git a/orbit/pkg/go-paniclog/paniclog_unix.go b/orbit/pkg/go-paniclog/paniclog_unix.go
index 08bf190b0e7..bac84ed773f 100644
--- a/orbit/pkg/go-paniclog/paniclog_unix.go
+++ b/orbit/pkg/go-paniclog/paniclog_unix.go
@@ -6,7 +6,7 @@
 package paniclog
 
 import (
-	"errors"
+	"fmt"
 	"os"
 
 	"golang.org/x/sys/unix"
@@ -16,12 +16,12 @@ func redirectStderr(f *os.File) (UndoFunction, error) {
 	stderrFd := int(os.Stderr.Fd())
 	oldfd, err := unix.Dup(stderrFd)
 	if err != nil {
-		return nil, errors.New("Failed to redirect stderr to file: " + err.Error())
+		return nil, fmt.Errorf("redirect stderr to file: %w", err)
 	}
 
 	err = unix.Dup2(int(f.Fd()), stderrFd)
 	if err != nil {
-		return nil, errors.New("Failed to redirect stderr to file: " + err.Error())
+		return nil, fmt.Errorf("redirect stderr to file: %w", err)
 	}
 
 	undo := func() error {
@@ -29,7 +29,7 @@ func redirectStderr(f *os.File) (UndoFunction, error) {
 		unix.Close(oldfd)
 
 		if undoErr != nil {
-			return errors.New("Failed to reverse stderr redirection: " + err.Error())
+			return fmt.Errorf("reverse stderr redirection: %w", undoErr)
 		}
 
 		return nil
diff --git a/orbit/pkg/table/app_sso_platform/app_sso_platform_darwin.go b/orbit/pkg/table/app_sso_platform/app_sso_platform_darwin.go
index ad079368287..5660a4c9992 100644
--- a/orbit/pkg/table/app_sso_platform/app_sso_platform_darwin.go
+++ b/orbit/pkg/table/app_sso_platform/app_sso_platform_darwin.go
@@ -232,7 +232,7 @@ func parseAppSSOPlatformCommandOutput(output []byte, expectedExtensionIdentifier
 	}
 	realm, ok := realm_.(string)
 	if !ok {
-		return nil, fmt.Errorf("unexpected type for \"realm\" key in \"kerberosStatus\": %T", err)
+		return nil, fmt.Errorf("unexpected type for \"realm\" key in \"kerberosStatus\": %T", realm_)
 	}
 	upn_, ok := userConfig.KerberosStatus[0]["upn"]
 	if !ok {
@@ -240,7 +240,7 @@ func parseAppSSOPlatformCommandOutput(output []byte, expectedExtensionIdentifier
 	}
 	upn, ok := upn_.(string)
 	if !ok {
-		return nil, fmt.Errorf("unexpected type for \"upn\" key in \"kerberosStatus\": %T", err)
+		return nil, fmt.Errorf("unexpected type for \"upn\" key in \"kerberosStatus\": %T", upn_)
 	}
 	if upn == "" {
 		return nil, errors.New("empty \"upn\" key in \"kerberosStatus\"")
diff --git a/orbit/pkg/table/cis_audit/cis_audit_windows.go b/orbit/pkg/table/cis_audit/cis_audit_windows.go
index 17a86f61ede..20da02897c2 100644
--- a/orbit/pkg/table/cis_audit/cis_audit_windows.go
+++ b/orbit/pkg/table/cis_audit/cis_audit_windows.go
@@ -250,8 +250,7 @@ func getSeceditData() (SeceditData, error) {
 	// Load the .inf file content
 	cfg, err := ini.Load(fileContent)
 	if err != nil {
-		fmt.Printf("Error: %v\n", err)
-		return data, err
+		return data, fmt.Errorf("failed to load secedit inf file: %w", err)
 	}
 
 	// Parse System Access section