diff --git a/cmd/add.go b/cmd/add.go
index ca6e783..5024c96 100644
--- a/cmd/add.go
+++ b/cmd/add.go
@@ -62,6 +62,7 @@ var addCmd = &cobra.Command{
 	PreRun: func(cmd *cobra.Command, args []string) {
 		if verbose {
 			log.SetLevel(log.DebugLevel)
+			keyring.Debug = true
 		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
@@ -169,14 +170,22 @@ var addCmd = &cobra.Command{
 			log.Fatal(err)
 		}
 
-		ring, _ := keyring.Open(keyringDefaults)
+		ring, err := keyring.Open(keyringDefaults)
+		if err != nil {
+			log.Fatalf("failed to open keyring backend: %s", strings.ToLower(err.Error()))
+		}
 
-		_ = ring.Set(keyring.Item{
+		resp := ring.Set(keyring.Item{
 			Key:  fmt.Sprintf("%s-%s", profileName, authType),
 			Data: []byte(authValue),
 		})
 
-		fmt.Println("\nSuccess! Credentials have been set and are now ready for use!")
+		if resp == nil {
+			fmt.Println("\nSuccess! Credentials have been set and are now ready for use!")
+		} else {
+			// error of some sort
+			log.Fatal("Error adding credentials to keyring: ", resp)
+		}
 	},
 }
 
diff --git a/cmd/exec.go b/cmd/exec.go
index 0f8cd88..88ce5ef 100644
--- a/cmd/exec.go
+++ b/cmd/exec.go
@@ -54,6 +54,7 @@ var execCmd = &cobra.Command{
 	PreRun: func(cmd *cobra.Command, args []string) {
 		if verbose {
 			log.SetLevel(log.DebugLevel)
+			keyring.Debug = true
 		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
diff --git a/script/build b/script/build
index f4eb21e..c0b3921 100755
--- a/script/build
+++ b/script/build
@@ -15,7 +15,7 @@ if [ -d build ]; then
 fi
 mkdir -p build
 
-platforms=("windows/amd64" "linux/amd64" "darwin/amd64")
+platforms=("windows/amd64" "linux/amd64" "darwin/amd64" "darwin/arm64")
 
 echo "==> Build started for v${version}"
 
@@ -35,9 +35,9 @@ do
   GCFLAGS="-gcflags=all=-trimpath=$GOPATH -asmflags=all=-trimpath=$GOPATH"
 
   if [ $GOOS = "windows" ]; then
-    env GOOS=$GOOS GOARCH=$GOARCH go build $GCFLAGS -o "build/${GOOS}/cf-vault.exe" -ldflags "-X github.com/jacobbednarz/cf-vault/cmd.Rev=${version_with_sha}" .
+    env GOOS=$GOOS GOARCH=$GOARCH go build $GCFLAGS -o "build/${GOOS}/${GOARCH}/cf-vault.exe" -ldflags "-X github.com/jacobbednarz/cf-vault/cmd.Rev=${version_with_sha}" .
   else
-    env GOOS=$GOOS GOARCH=$GOARCH go build $GCFLAGS -o "build/${GOOS}/cf-vault" -ldflags "-X github.com/jacobbednarz/cf-vault/cmd.Rev=${version_with_sha}" .
+    env GOOS=$GOOS GOARCH=$GOARCH go build $GCFLAGS -o "build/${GOOS}/${GOARCH}/cf-vault" -ldflags "-X github.com/jacobbednarz/cf-vault/cmd.Rev=${version_with_sha}" .
   fi
   if [ $? -ne 0 ]; then
     echo "Building the binary has failed!"
@@ -48,9 +48,9 @@ do
 
   printf "==> Tarballing %s\t%s\n" "$platform" "build/${output_name}.tar.gz" | expand -t 30
   if [ $GOOS = "windows" ]; then
-    tar -czf "build/${output_name}.tar.gz" -C "build/$GOOS" "cf-vault.exe"
+    tar -czf "build/${output_name}.tar.gz" -C "build/$GOOS/$GOARCH" "cf-vault.exe"
   else
-    tar -czf "build/${output_name}.tar.gz" -C "build/$GOOS" "cf-vault"
+    tar -czf "build/${output_name}.tar.gz" -C "build/$GOOS/$GOARCH" "cf-vault"
   fi
 
   if [ $? -ne 0 ]; then
@@ -59,7 +59,7 @@ do
   fi
 
   echo "==> Adding file checksums to build/checksums.txt"
-  shasum -a 256 build/$GOOS/* >> "build/checksums.txt"
+  shasum -a 256 build/$GOOS/$GOARCH/* >> "build/checksums.txt"
 done
 
 shasum -a 256 build/*.tar.gz >> "build/checksums.txt"