3 files changed, 9 insertions, 0 deletions

diff --git a/cmd/ship/env/list.go b/cmd/ship/env/list.go
index ad76eb6..e94b83a 100644
--- a/cmd/ship/env/list.go
+++ b/cmd/ship/env/list.go
@@ -17,6 +17,9 @@ var listCmd = &cobra.Command{
 
 func runList(cmd *cobra.Command, args []string) error {
         name := args[0]
+        if err := state.ValidateName(name); err != nil {
+                return err
+        }
 
         st, err := state.Load()
         if err != nil {
diff --git a/cmd/ship/env/set.go b/cmd/ship/env/set.go
index e11d2c9..d4292f3 100644
--- a/cmd/ship/env/set.go
+++ b/cmd/ship/env/set.go
@@ -25,6 +25,9 @@ func init() {
 
 func runSet(cmd *cobra.Command, args []string) error {
         name := args[0]
+        if err := state.ValidateName(name); err != nil {
+                return err
+        }
         envVars := args[1:]
 
         st, err := state.Load()
diff --git a/cmd/ship/env/unset.go b/cmd/ship/env/unset.go
index 7d9a141..8292f42 100644
--- a/cmd/ship/env/unset.go
+++ b/cmd/ship/env/unset.go
@@ -18,6 +18,9 @@ var unsetCmd = &cobra.Command{
 
 func runUnset(cmd *cobra.Command, args []string) error {
         name := args[0]
+        if err := state.ValidateName(name); err != nil {
+                return err
+        }
         keys := args[1:]
 
         st, err := state.Load()