Replaced return with log.Fatal