Add check for empty album and handle them gracefully

Add check for empty album and handle them gracefully #3992