diff --git a/command/plugins_test.go b/command/plugins_test.go
index e0cd13c5b..7c7200ae5 100644
--- a/command/plugins_test.go
+++ b/command/plugins_test.go
@@ -13,6 +13,9 @@ import (
 
 func TestPluginPath(t *testing.T) {
 	td, err := ioutil.TempDir("", "tf")
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer os.RemoveAll(td)
 	defer testChdir(t, td)()
 
diff --git a/command/workspace_new.go b/command/workspace_new.go
index 53a873030..af7ad2265 100644
--- a/command/workspace_new.go
+++ b/command/workspace_new.go
@@ -75,6 +75,10 @@ func (c *WorkspaceNewCommand) Run(args []string) int {
 	}
 
 	states, err := b.States()
+	if err != nil {
+		c.Ui.Error(fmt.Sprintf("Failed to get configured named states: %s", err))
+		return 1
+	}
 	for _, s := range states {
 		if newEnv == s {
 			c.Ui.Error(fmt.Sprintf(envExists, newEnv))