diff --git a/errors/errors.go b/errors/errors.go
index e40aecd..a26a39b 100644
--- a/errors/errors.go
+++ b/errors/errors.go
@@ -23,7 +23,7 @@ func (e Error) Error() string { return string(e) }
 const (
 	NoCredentialsFoundInCache      = Error("no credentials found in cache")
 	NoDefaultRoleSet               = Error("no default role set")
-	CredentialGenerationFailed     = Error("credential generation failed")
+	BrowserOpenError               = Error("could not launch browser, open link manually")
 	CredentialRetrievalError       = Error("failed to retrieve credentials from broker")
 	InvalidJWT                     = Error("JWT is invalid")
 	InvalidArn                     = Error("requested ARN is invalid")
diff --git a/util/util.go b/util/util.go
index 3eb63aa..ffddba0 100644
--- a/util/util.go
+++ b/util/util.go
@@ -17,7 +17,6 @@
 package util
 
 import (
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -26,6 +25,7 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/netflix/weep/errors"
 	"github.com/netflix/weep/logging"
 )
 
@@ -49,7 +49,7 @@ type ErrorResponse struct {
 
 func validate(arn string, pieces []string) error {
 	if len(pieces) < 6 {
-		return fmt.Errorf("malformed ARN: %s", arn)
+		return errors.InvalidArn
 	}
 	return nil
 }
@@ -120,7 +120,8 @@ func OpenLink(link string) error {
 			openUrlCommand = []string{"xdg-open"}
 		}
 	case "windows":
-		openUrlCommand = []string{"cmd", "/C", "start"}
+		// This is unsupported until we find a safer way to run the open command in Windows.
+		return errors.BrowserOpenError
 	}
 
 	if openUrlCommand != nil {
@@ -135,7 +136,7 @@ func OpenLink(link string) error {
 			log.Infoln("Link opened in a new browser window.")
 		}
 	} else {
-		return errors.New("Could not automatically launch browser window. Open the above link manually to continue.")
+		return errors.BrowserOpenError
 	}
 	return nil
 }