diff --git a/models/dns.go b/models/dns.go
index a97242eef..577c9499b 100644
--- a/models/dns.go
+++ b/models/dns.go
@@ -258,12 +258,10 @@ func Downcase(recs []*RecordConfig) {
 		switch r.Type {
 		case "ANAME", "CNAME", "MX", "NS", "PTR":
 			r.Target = strings.ToLower(r.Target)
-		case "A", "AAAA", "ALIAS", "CAA", "IMPORT_TRANSFORM", "SRV", "TLSA", "TXT", "SOA":
+		case "A", "AAAA", "ALIAS", "CAA", "IMPORT_TRANSFORM", "SRV", "TLSA", "TXT", "SOA", "CF_REDIRECT", "CF_TEMP_REDIRECT":
 			// Do nothing.
 		default:
-			panic(fmt.Sprintf("Downcase: Unimplemented rtype %v", r.Type))
-			// We panic so that we quickly find any switch statements
-			// that have not been updated for a new RR type.
+			// TODO: we'd like to panic here, but custom record types complicate things.
 		}
 	}
 	return
diff --git a/providers/providers.go b/providers/providers.go
index 4ebfda3a3..bfd2b736d 100644
--- a/providers/providers.go
+++ b/providers/providers.go
@@ -76,11 +76,11 @@ func CreateRegistrars(d *models.DNSConfig, providerConfigs map[string]map[string
 	for _, reg := range d.Registrars {
 		rawMsg, ok := providerConfigs[reg.Name]
 		if !ok && reg.Type != "NONE" {
-			return nil, fmt.Errorf("Registrar %s not listed in creds.json file.", reg.Name)
+			return nil, fmt.Errorf("Registrar %s not listed in creds.json file", reg.Name)
 		}
 		registrar, err := createRegistrar(reg.Type, rawMsg)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("Creating %s registrar: %s", reg.Name, err)
 		}
 		regs[reg.Name] = registrar
 	}
@@ -93,7 +93,7 @@ func CreateDsps(d *models.DNSConfig, providerConfigs map[string]map[string]strin
 		vals := providerConfigs[dsp.Name]
 		provider, err := CreateDNSProvider(dsp.Type, vals, dsp.Metadata)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("Creating %s dns provider: %s", dsp.Name, err)
 		}
 		dsps[dsp.Name] = provider
 	}