diff --git a/cmd/juju/commands/upgrademodel.go b/cmd/juju/commands/upgrademodel.go
index <HASH>..<HASH> 100644
--- a/cmd/juju/commands/upgrademodel.go
+++ b/cmd/juju/commands/upgrademodel.go
@@ -583,11 +583,10 @@ func (c *upgradeJujuCommand) validateModelUpgrade() error {
 		return errors.Trace(err)
 	}
 	// TODO (stickupkid): Define force for validation of model upgrade.
-	if err := client.ValidateModelUpgrade(names.NewModelTag(details.ModelUUID), false); err != nil {
-		return errors.Trace(err)
+	if err = client.ValidateModelUpgrade(names.NewModelTag(details.ModelUUID), false); errors.IsNotImplemented(err) {
+		return nil
 	}
-
-	return nil
+	return errors.Trace(err)
 }
 
 // environConfigGetter implements environs.EnvironConfigGetter for use
Fix the validate model upgrade from a facade

This was fixed originally in develop, but actually needed to be fixed in
the <I> branch. Essentially this makes upgrading to <I> invalid because
it expects that you already have the facade available.