diff --git a/load.go b/load.go
index 5373025..87831fc 100644
--- a/load.go
+++ b/load.go
@@ -34,9 +34,11 @@ func ConfigLoad(pb proto.Message, argname string, protoname string) error {
 	}
 
 	fullname = filepath.Join(homeDir, ".config", argname, protoname+".text")
+
 	if data, err = loadFile(fullname); err != nil {
 		log.Warn("config file failed to load", err)
-		// something went wrong loading the file
+		// set pb.Filename that was attempted
+		SetFilename(pb, fullname)
 		return err
 	}
 
@@ -50,9 +52,6 @@ func ConfigLoad(pb proto.Message, argname string, protoname string) error {
 		return err
 	}
 
-	// set pb.Filename if it is there in the .proto file
-	SetFilename(pb, fullname)
-
 	log.Infof("ConfigLoad() arg=%s, proto=%s\n", argname, protoname)
 	return nil
 }
diff --git a/save.go b/save.go
index 35bf233..2f2db15 100644
--- a/save.go
+++ b/save.go
@@ -20,22 +20,19 @@ func ConfigSave(pb proto.Message) error {
 	}
 
 	// Unmarshal()
-	data, err := prototext.Marshal(pb)
-	if err != nil {
-		return err
-	}
+	s := prototext.Format(pb)
 
 	dir, name := filepath.Split(fullname)
 	if name == "" {
 		return fmt.Errorf("filename was blank")
 	}
-	err = os.MkdirAll(dir, os.ModePerm)
+	err := os.MkdirAll(dir, os.ModePerm)
 	if err != nil {
 		return err
 	}
 
-	log.Infof("ConfigSave() filename=%s %d\n", fullname, len(data))
-	return configWrite(fullname, data)
+	log.Infof("ConfigSave() filename=%s %d\n", fullname, len(s))
+	return configWrite(fullname, []byte(s))
 }
 
 func configWrite(fullname string, data []byte) error {