diff --git a/js/app.js b/js/app.js
index 2abe6527..dd8d5104 100755
--- a/js/app.js
+++ b/js/app.js
@@ -499,9 +499,13 @@ Audios.prototype.loadAlbums = function(){
 			 		divSongsContainer.append(listAlbumSelect);
 			 		
 			 		var aSongs=[];
-			 		$.each(songs[album.id],function(ii,songs){
-			 			aSongs[ii] = $this.loadSongsRow(songs, album.name);
-			 		});
+			 		if(songs[album.id]){
+				 		$.each(songs[album.id],function(ii,songs){
+				 			aSongs[ii] = $this.loadSongsRow(songs, album.name);
+				 		});
+			 		}else{
+			 			console.warn('Could not find songs for album:', album.name, album);
+			 		}
 			 		
 			 		listAlbumSelect.append(aSongs);
 			 		var br = $('<br />').css('clear','both');