diff --git a/upup/cmd/cloudup/main.go b/upup/cmd/cloudup/main.go
index 25daf7793f..3a547fe280 100644
--- a/upup/cmd/cloudup/main.go
+++ b/upup/cmd/cloudup/main.go
@@ -446,6 +446,7 @@ func (c *CreateClusterCmd) Run() error {
 	switch c.Config.CloudProvider {
 	case "gce":
 		{
+			glog.Fatalf("GCE is (probably) not working currently - please ping @justinsb for cleanup")
 			tags["_gce"] = struct{}{}
 			c.Config.NodeUpTags = append(c.Config.NodeUpTags, "_gce")
 
diff --git a/upup/pkg/kutil/upgrade_cluster.go b/upup/pkg/kutil/upgrade_cluster.go
index 08a95f494c..cd16a2e8a6 100644
--- a/upup/pkg/kutil/upgrade_cluster.go
+++ b/upup/pkg/kutil/upgrade_cluster.go
@@ -51,7 +51,7 @@ func (x *UpgradeCluster) Upgrade() error {
 
 	dhcpOptions, err := DescribeDhcpOptions(x.Cloud)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	// Find masters
@@ -124,7 +124,7 @@ func (x *UpgradeCluster) Upgrade() error {
 	// Retag DHCP options
 	// We have to be careful because DHCP options can be shared
 	for _, dhcpOption := range dhcpOptions {
-		clusterTag := dhcpOption.Tags[awsup.TagClusterName]
+		clusterTag, _ := awsup.FindEC2Tag(dhcpOption.Tags, awsup.TagClusterName)
 		if clusterTag != "" {
 			if clusterTag != oldClusterName {
 				return fmt.Errorf("DHCP options are tagged with a different cluster: %v", clusterTag)