6 files changed, 13 insertions, 9 deletions
diff --git a/forged/internal/common/bare/errors.go b/forged/internal/common/bare/errors.go
index 39c951a..4634f0c 100644
--- a/forged/internal/common/bare/errors.go
+++ b/forged/internal/common/bare/errors.go
@@ -9,12 +9,12 @@ import (
 	"reflect"
 )
 
-var ErrInvalidStr = errors.New("String contains invalid UTF-8 sequences")
+var ErrInvalidStr = errors.New("string contains invalid UTF-8 sequences")
 
 type UnsupportedTypeError struct {
 	Type reflect.Type
 }
 
 func (e *UnsupportedTypeError) Error() string {
-	return fmt.Sprintf("Unsupported type for marshaling: %s\n", e.Type.String())
+	return fmt.Sprintf("unsupported type for marshaling: %s\n", e.Type.String())
 }
diff --git a/forged/internal/common/bare/limit.go b/forged/internal/common/bare/limit.go
index 212bc05..7eece8c 100644
--- a/forged/internal/common/bare/limit.go
+++ b/forged/internal/common/bare/limit.go
@@ -32,7 +32,7 @@ func MaxMapSize(size uint64) {
 
 // Use MaxUnmarshalBytes to prevent this error from occuring on messages which
 // are large by design.
-var ErrLimitExceeded = errors.New("Maximum message size exceeded")
+var ErrLimitExceeded = errors.New("maximum message size exceeded")
 
 // Identical to io.LimitedReader, except it returns our custom error instead of
 // EOF if the limit is reached.
diff --git a/forged/internal/common/bare/marshal.go b/forged/internal/common/bare/marshal.go
index 1ce942d..d4c338e 100644
--- a/forged/internal/common/bare/marshal.go
+++ b/forged/internal/common/bare/marshal.go
@@ -54,7 +54,7 @@ func MarshalWriter(w *Writer, val interface{}) error {
 	t := reflect.TypeOf(val)
 	v := reflect.ValueOf(val)
 	if t.Kind() != reflect.Ptr {
-		return errors.New("Expected val to be pointer type")
+		return errors.New("expected val to be pointer type")
 	}
 
 	return getEncoder(t.Elem())(w, v.Elem())
diff --git a/forged/internal/common/bare/reader.go b/forged/internal/common/bare/reader.go
index 028a7aa..7e872f4 100644
--- a/forged/internal/common/bare/reader.go
+++ b/forged/internal/common/bare/reader.go
@@ -157,7 +157,7 @@ func (r *Reader) ReadString() (string, error) {
 
 // Reads a fixed amount of arbitrary data, defined by the length of the slice.
 func (r *Reader) ReadDataFixed(dest []byte) error {
-	var amt int = 0
+	var amt int
 	for amt < len(dest) {
 		n, err := r.base.Read(dest[amt:])
 		if err != nil {
diff --git a/forged/internal/common/bare/writer.go b/forged/internal/common/bare/writer.go
index 80cd7e2..1b23c9f 100644
--- a/forged/internal/common/bare/writer.go
+++ b/forged/internal/common/bare/writer.go
@@ -92,7 +92,7 @@ func (w *Writer) WriteString(str string) error {
 
 // Writes a fixed amount of arbitrary data, defined by the length of the slice.
 func (w *Writer) WriteDataFixed(data []byte) error {
-	var amt int = 0
+	var amt int
 	for amt < len(data) {
 		n, err := w.base.Write(data[amt:])
 		if err != nil {
@@ -109,7 +109,7 @@ func (w *Writer) WriteData(data []byte) error {
 	if err != nil {
 		return err
 	}
-	var amt int = 0
+	var amt int
 	for amt < len(data) {
 		n, err := w.base.Write(data[amt:])
 		if err != nil {
diff --git a/forged/internal/common/scfg/reader.go b/forged/internal/common/scfg/reader.go
index 6a2bedc..b0e2cc0 100644
--- a/forged/internal/common/scfg/reader.go
+++ b/forged/internal/common/scfg/reader.go
@@ -15,12 +15,16 @@ import (
 const maxNestingDepth = 1000
 
 // Load loads a configuration file.
-func Load(path string) (Block, error) {
+func Load(path string) (block Block, err error) {
 	f, err := os.Open(path)
 	if err != nil {
 		return nil, err
 	}
-	defer f.Close()
+	defer func() {
+		if cerr := f.Close(); err == nil && cerr != nil {
+			err = cerr
+		}
+	}()
 
 	return Read(f)
 }