diff --git a/apiGo/videoparser/ReIndex.go b/apiGo/videoparser/ReIndex.go
index f898920..a8ca707 100644
--- a/apiGo/videoparser/ReIndex.go
+++ b/apiGo/videoparser/ReIndex.go
@@ -139,8 +139,8 @@ func matchYear(fileName string) (int, string) {
 	if len(years) == 0 {
 		return -1, fileName
 	}
-
-	year, err := strconv.Atoi(years[len(years)-1])
+	// get last year occurance and cut first and last char
+	year, err := strconv.Atoi(years[len(years)-1][1 : len(years)-1])
 
 	if err != nil {
 		return -1, fileName
diff --git a/apiGo/videoparser/tmdb/TMDBApi.go b/apiGo/videoparser/tmdb/TMDBApi.go
index 5e9c28a..6905014 100644
--- a/apiGo/videoparser/tmdb/TMDBApi.go
+++ b/apiGo/videoparser/tmdb/TMDBApi.go
@@ -63,6 +63,11 @@ func SearchVideo(MovieName string, year int) *VideoTMDB {
 
 	fmt.Println(len(t.Results))
 
+	// if there was no match with tmdb return 0
+	if len(t.Results) == 0 {
+		return nil
+	}
+
 	var tmdbVid tmdbVidResult
 	if year != -1 {
 		for _, result := range t.Results {