diff --git a/cmd/apidocs/export.go b/cmd/apidocs/export.go
index 9849a25f2..ff21c56da 100644
--- a/cmd/apidocs/export.go
+++ b/cmd/apidocs/export.go
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/cmd/org/export.go b/cmd/org/export.go
index a477c599f..2c278ab5d 100644
--- a/cmd/org/export.go
+++ b/cmd/org/export.go
@@ -182,7 +182,9 @@ var ExportCmd = &cobra.Command{
 		}
 
 		clilog.Info.Println("Exporting API Portal apidocs Configuration...")
-		apidocs.Export(portalsFolderName)
+		if err = apidocs.Export(portalsFolderName); proceedOnError(err) != nil {
+			return err
+		}
 
 		if runtimeType == "HYBRID" {
 			clilog.Info.Println("Exporting Sync Authorization Identities...")
@@ -311,10 +313,10 @@ func createFolders() (err error) {
 	if err = os.Mkdir(proxiesFolderName, 0o755); err != nil {
 		return err
 	}
-	if os.Mkdir(sharedFlowsFolderName, 0o755); err != nil {
+	if err = os.Mkdir(sharedFlowsFolderName, 0o755); err != nil {
 		return err
 	}
-	if os.Mkdir(portalsFolderName, 0o755); err != nil {
+	if err = os.Mkdir(portalsFolderName, 0o755); err != nil {
 		return err
 	}
 	return nil
diff --git a/cmd/sites/sites.go b/cmd/sites/sites.go
index 4f1791c7b..2774ffd9a 100644
--- a/cmd/sites/sites.go
+++ b/cmd/sites/sites.go
@@ -25,7 +25,7 @@ var Cmd = &cobra.Command{
 	Long:  "Manage Apigee API Portals",
 }
 
-var org, siteid, id, name string
+var org string
 
 func init() {
 	Cmd.PersistentFlags().StringVarP(&org, "org", "o",