diff --git a/pkg/manager/jsonschema/gallery.go b/pkg/manager/jsonschema/gallery.go
index db6211b7b..e633c021f 100644
--- a/pkg/manager/jsonschema/gallery.go
+++ b/pkg/manager/jsonschema/gallery.go
@@ -29,10 +29,10 @@ type Gallery struct {
 func LoadGalleryFile(filePath string) (*Gallery, error) {
 	var gallery Gallery
 	file, err := os.Open(filePath)
-	defer file.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer file.Close()
 	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	jsonParser := json.NewDecoder(file)
 	err = jsonParser.Decode(&gallery)
diff --git a/pkg/manager/jsonschema/image.go b/pkg/manager/jsonschema/image.go
index 118899ef8..82cf23cdc 100644
--- a/pkg/manager/jsonschema/image.go
+++ b/pkg/manager/jsonschema/image.go
@@ -33,10 +33,10 @@ type Image struct {
 func LoadImageFile(filePath string) (*Image, error) {
 	var image Image
 	file, err := os.Open(filePath)
-	defer file.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer file.Close()
 	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	jsonParser := json.NewDecoder(file)
 	err = jsonParser.Decode(&image)
diff --git a/pkg/manager/jsonschema/mappings.go b/pkg/manager/jsonschema/mappings.go
index 1622e52a4..8f20ae755 100644
--- a/pkg/manager/jsonschema/mappings.go
+++ b/pkg/manager/jsonschema/mappings.go
@@ -26,10 +26,10 @@ type Mappings struct {
 func LoadMappingsFile(filePath string) (*Mappings, error) {
 	var mappings Mappings
 	file, err := os.Open(filePath)
-	defer file.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer file.Close()
 	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	jsonParser := json.NewDecoder(file)
 	err = jsonParser.Decode(&mappings)
diff --git a/pkg/manager/jsonschema/movie.go b/pkg/manager/jsonschema/movie.go
index c76f05055..585627019 100644
--- a/pkg/manager/jsonschema/movie.go
+++ b/pkg/manager/jsonschema/movie.go
@@ -27,10 +27,10 @@ type Movie struct {
 func LoadMovieFile(filePath string) (*Movie, error) {
 	var movie Movie
 	file, err := os.Open(filePath)
-	defer file.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer file.Close()
 	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	jsonParser := json.NewDecoder(file)
 	err = jsonParser.Decode(&movie)
diff --git a/pkg/manager/jsonschema/performer.go b/pkg/manager/jsonschema/performer.go
index 0ff38bff6..ec1aec4bb 100644
--- a/pkg/manager/jsonschema/performer.go
+++ b/pkg/manager/jsonschema/performer.go
@@ -40,10 +40,10 @@ type Performer struct {
 func LoadPerformerFile(filePath string) (*Performer, error) {
 	var performer Performer
 	file, err := os.Open(filePath)
-	defer file.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer file.Close()
 	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	jsonParser := json.NewDecoder(file)
 	err = jsonParser.Decode(&performer)
diff --git a/pkg/manager/jsonschema/scene.go b/pkg/manager/jsonschema/scene.go
index 540447757..b0207f33c 100644
--- a/pkg/manager/jsonschema/scene.go
+++ b/pkg/manager/jsonschema/scene.go
@@ -61,10 +61,10 @@ type Scene struct {
 func LoadSceneFile(filePath string) (*Scene, error) {
 	var scene Scene
 	file, err := os.Open(filePath)
-	defer file.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer file.Close()
 	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	jsonParser := json.NewDecoder(file)
 	err = jsonParser.Decode(&scene)
diff --git a/pkg/manager/jsonschema/scraped.go b/pkg/manager/jsonschema/scraped.go
index 5ac26b676..9837a1210 100644
--- a/pkg/manager/jsonschema/scraped.go
+++ b/pkg/manager/jsonschema/scraped.go
@@ -27,10 +27,10 @@ type ScrapedItem struct {
 func LoadScrapedFile(filePath string) ([]ScrapedItem, error) {
 	var scraped []ScrapedItem
 	file, err := os.Open(filePath)
-	defer file.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer file.Close()
 	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	jsonParser := json.NewDecoder(file)
 	err = jsonParser.Decode(&scraped)
diff --git a/pkg/manager/jsonschema/studio.go b/pkg/manager/jsonschema/studio.go
index 82a7e740a..ed1b6d144 100644
--- a/pkg/manager/jsonschema/studio.go
+++ b/pkg/manager/jsonschema/studio.go
@@ -22,10 +22,10 @@ type Studio struct {
 func LoadStudioFile(filePath string) (*Studio, error) {
 	var studio Studio
 	file, err := os.Open(filePath)
-	defer file.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer file.Close()
 	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	jsonParser := json.NewDecoder(file)
 	err = jsonParser.Decode(&studio)
diff --git a/pkg/manager/jsonschema/tag.go b/pkg/manager/jsonschema/tag.go
index 06ca48be8..28833c4c5 100644
--- a/pkg/manager/jsonschema/tag.go
+++ b/pkg/manager/jsonschema/tag.go
@@ -18,10 +18,10 @@ type Tag struct {
 func LoadTagFile(filePath string) (*Tag, error) {
 	var tag Tag
 	file, err := os.Open(filePath)
-	defer file.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer file.Close()
 	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	jsonParser := json.NewDecoder(file)
 	err = jsonParser.Decode(&tag)
diff --git a/pkg/plugin/config.go b/pkg/plugin/config.go
index c3bbfe9cd..32da5b521 100644
--- a/pkg/plugin/config.go
+++ b/pkg/plugin/config.go
@@ -211,10 +211,10 @@ func loadPluginFromYAML(reader io.Reader) (*Config, error) {
 
 func loadPluginFromYAMLFile(path string) (*Config, error) {
 	file, err := os.Open(path)
-	defer file.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer file.Close()
 
 	ret, err := loadPluginFromYAML(file)
 	if err != nil {
diff --git a/pkg/scraper/config.go b/pkg/scraper/config.go
index 4eeb97af3..c16d55a7f 100644
--- a/pkg/scraper/config.go
+++ b/pkg/scraper/config.go
@@ -209,10 +209,10 @@ func loadScraperFromYAML(id string, reader io.Reader) (*config, error) {
 
 func loadScraperFromYAMLFile(path string) (*config, error) {
 	file, err := os.Open(path)
-	defer file.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer file.Close()
 
 	// set id to the filename
 	id := filepath.Base(path)