diff --git a/viper.go b/viper.go
index 07ef850..712c5e3 100644
--- a/viper.go
+++ b/viper.go
@@ -1469,6 +1469,9 @@ func (v *Viper) marshalWriter(f afero.File, configType string) error {
 
 	case "hcl":
 		b, err := json.Marshal(c)
+		if err != nil {
+			return ConfigMarshalError{err}
+		}
 		ast, err := hcl.Parse(string(b))
 		if err != nil {
 			return ConfigMarshalError{err}
diff --git a/viper_test.go b/viper_test.go
index f91791f..c1ea262 100644
--- a/viper_test.go
+++ b/viper_test.go
@@ -952,6 +952,7 @@ func TestDirsSearch(t *testing.T) {
 	v.SetDefault(`key`, `default`)
 
 	entries, err := ioutil.ReadDir(root)
+	assert.Nil(t, err)
 	for _, e := range entries {
 		if e.IsDir() {
 			v.AddConfigPath(e.Name())