diff --git a/controllers/get_music_folders.go b/controllers/get_music_folders.go
index 79f6ebbc0..610a4fb3c 100644
--- a/controllers/get_music_folders.go
+++ b/controllers/get_music_folders.go
@@ -13,7 +13,7 @@ func (this *GetMusicFoldersController) Get() {
 	validate(this)
 
 	repository := new(repositories.MediaFolderRepository)
-	mediaFolderList := repository.GetAll()
+	mediaFolderList, _ := repository.GetAll()
 	folders := make([]responses.MusicFolder, len(mediaFolderList))
 	for i, f := range mediaFolderList {
 		folders[i].Id = f.Id
diff --git a/repositories/media_folders_repository.go b/repositories/media_folders_repository.go
index cd0172678..db204ca85 100644
--- a/repositories/media_folders_repository.go
+++ b/repositories/media_folders_repository.go
@@ -7,9 +7,9 @@ import (
 
 type MediaFolderRepository struct {}
 
-func (*MediaFolderRepository) GetAll() []*models.MediaFolder {
+func (*MediaFolderRepository) GetAll() ([]*models.MediaFolder, error) {
 	mediaFolder := models.MediaFolder{Id: "1", Name: "iTunes Library", Path: beego.AppConfig.String("musicFolder")}
 	result := make([]*models.MediaFolder, 1)
 	result[0] = &mediaFolder
-	return result
+	return result, nil
 }
\ No newline at end of file