diff --git a/cmd/fission-cli/main.go b/cmd/fission-cli/main.go
index 2edfd059..10077935 100644
--- a/cmd/fission-cli/main.go
+++ b/cmd/fission-cli/main.go
@@ -17,9 +17,15 @@ limitations under the License.
 package main
 
 import (
+	"os"
+
 	"github.com/fission/fission/cmd/fission-cli/app"
 )
 
 func main() {
-	app.App().Execute()
+	err := app.App().Execute()
+	if err != nil {
+		// let program exit with non-zero code when error occurs
+		os.Exit(1)
+	}
 }
diff --git a/pkg/fission-cli/cmd/function/command.go b/pkg/fission-cli/cmd/function/command.go
index 6aef5f1b..8611b478 100644
--- a/pkg/fission-cli/cmd/function/command.go
+++ b/pkg/fission-cli/cmd/function/command.go
@@ -70,7 +70,7 @@ func Commands() *cobra.Command {
 	wrapper.SetFlags(updateCmd, flag.FlagSet{
 		Required: []flag.Flag{flag.FnName},
 		Optional: []flag.Flag{flag.NamespaceFunction, flag.NamespaceEnvironment, flag.SpecSave,
-			flag.FnCode, flag.PkgSrcArchive, flag.PkgDeployArchive,
+			flag.FnCode, flag.PkgSrcArchive, flag.PkgDeployArchive, flag.FnEnvName,
 			flag.FnKeepURL, flag.FnEntryPoint, flag.FnBuildCmd, flag.FnPkgName, flag.HtUrl,
 			flag.HtMethod, flag.RunTimeMinCPU, flag.RunTimeMaxCPU, flag.RunTimeMinMemory,
 			flag.RunTimeMaxMemory, flag.ReplicasMin, flag.ReplicasMax, flag.FnExecutorType,
diff --git a/test/tests/test_specs/test_spec_merge/test_spec_merge.sh b/test/tests/test_specs/test_spec_merge/test_spec_merge.sh
index d822eeba..da54dad9 100755
--- a/test/tests/test_specs/test_spec_merge/test_spec_merge.sh
+++ b/test/tests/test_specs/test_spec_merge/test_spec_merge.sh
@@ -9,8 +9,8 @@ fn_nd=nodehellond
 
 cleanup() {
     echo "Cleaning up..."
-    popd
     fission spec destroy || true
+    popd
 }
 
 trap cleanup EXIT
@@ -35,4 +35,4 @@ hnp=$(kubectl -n $FUNCTION_NAMESPACE get deployment -l=environmentName=$env_p -o
 if [[ "${hnp}" == "foo-bar" ]]
     then
         echo "Hostname matches for poolmgr function, podspec test 2/2 passsed"
-    fi    
\ No newline at end of file
+    fi