diff --git a/cmd/krew/cmd/uninstall.go b/cmd/krew/cmd/uninstall.go
index 6f3f0781..480b41b7 100644
--- a/cmd/krew/cmd/uninstall.go
+++ b/cmd/krew/cmd/uninstall.go
@@ -39,10 +39,10 @@ Remarks:
   Failure to uninstall a plugin will result in an error and exit immediately.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		for _, name := range args {
+			if isCanonicalName(name) {
+				return errors.New("uninstall command does not support INDEX/PLUGIN syntax; just specify PLUGIN")
+			}
 			if !validation.IsSafePluginName(name) {
-				if isCanonicalName(name) {
-					return errors.New("uninstall command does not support INDEX/PLUGIN syntax; just specify PLUGIN")
-				}
 				return unsafePluginNameErr(name)
 			}
 			klog.V(4).Infof("Going to uninstall plugin %s\n", name)
diff --git a/cmd/krew/cmd/upgrade.go b/cmd/krew/cmd/upgrade.go
index 41906f03..938cfdb5 100644
--- a/cmd/krew/cmd/upgrade.go
+++ b/cmd/krew/cmd/upgrade.go
@@ -61,15 +61,15 @@ kubectl krew upgrade foo bar"`,
 			} else {
 				// Upgrade certain plugins
 				for _, arg := range args {
+					if isCanonicalName(arg) {
+						return errors.New("upgrade command does not support INDEX/PLUGIN syntax; just specify PLUGIN")
+					}
 					if !validation.IsSafePluginName(arg) {
-						if isCanonicalName(arg) {
-							return errors.New("upgrade command does not support INDEX/PLUGIN syntax; just specify PLUGIN")
-						}
 						return unsafePluginNameErr(arg)
 					}
 					r, err := receipt.Load(paths.PluginInstallReceiptPath(arg))
 					if err != nil {
-						return errors.Wrapf(err, "receipt not found for %q", arg)
+						return errors.Wrapf(err, "read receipt %q", arg)
 					}
 					pluginNames = append(pluginNames, r.Status.Source.Name+"/"+r.Name)
 				}