diff --git a/app/src/main/java/com/cappielloantonio/tempo/repository/ArtistRepository.java b/app/src/main/java/com/cappielloantonio/tempo/repository/ArtistRepository.java
index d823958d..7cd69c20 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/repository/ArtistRepository.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/repository/ArtistRepository.java
@@ -11,7 +11,7 @@ import com.cappielloantonio.tempo.subsonic.models.AlbumID3;
 import com.cappielloantonio.tempo.subsonic.models.ArtistInfo2;
 import com.cappielloantonio.tempo.subsonic.models.Child;
 import com.cappielloantonio.tempo.subsonic.models.IndexID3;
-import com.cappielloantonio.tempo.util.Constants;
+import com.cappielloantonio.tempo.util.Constants.SeedType;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -150,7 +150,7 @@ public class ArtistRepository {
 
                             if(response.body().getSubsonicResponse().getArtists() != null && response.body().getSubsonicResponse().getArtists().getIndices() != null) {
                                 for (IndexID3 index : response.body().getSubsonicResponse().getArtists().getIndices()) {
-                                    if(index != null && index.getArtists() != null) {
+                                    if(index.getArtists() != null) {
                                         artists.addAll(index.getArtists());
                                     }
                                 }
@@ -289,7 +289,7 @@ public class ArtistRepository {
 
     public MutableLiveData<List<Child>> getInstantMix(ArtistID3 artist, int count) {
         // Delegate to the centralized SongRepository
-        return new SongRepository().getInstantMix(artist.getId(), Constants.SEEDTYPE.ARTIST, count);
+        return new SongRepository().getInstantMix(artist.getId(), SeedType.ARTIST, count);
     }
 
     public MutableLiveData<List<Child>> getRandomSong(ArtistID3 artist, int count) {