diff --git a/src/org/xbmc/jsonrpc/client/MusicClient.java b/src/org/xbmc/jsonrpc/client/MusicClient.java
index d500bcba..f23a9d72 100644
--- a/src/org/xbmc/jsonrpc/client/MusicClient.java
+++ b/src/org/xbmc/jsonrpc/client/MusicClient.java
@@ -407,8 +407,8 @@ public ArrayList<Artist> getArtists(INotifiableManager manager, ObjNode obj, boo
 		obj = sort(obj, SortType.ARTIST, "descending");
 		final ArrayList<Artist> artists = new ArrayList<Artist>();
 		final JsonNode result = mConnection.getJson(manager, "AudioLibrary.GetArtists", obj);
-		if(result != null){
-			final JsonNode jsonArtists = result.get("artists");
+		final JsonNode jsonArtists = (result == null ? null : result.get("artists"));
+		if(jsonArtists != null){
 			for (Iterator<JsonNode> i = jsonArtists.getElements(); i.hasNext();) {
 				JsonNode jsonArtist = (JsonNode)i.next();
 				artists.add(new Artist(
@@ -444,13 +444,15 @@ public ArrayList<Genre> getGenres(INotifiableManager manager) {
 		
 		final ArrayList<Genre> genres = new ArrayList<Genre>();
 		final JsonNode result = mConnection.getJson(manager, "AudioLibrary.GetGenres", sort(obj(), SortType.TITLE, "descending"));
-		final JsonNode jsonGenres = result.get("genres");
-		for (Iterator<JsonNode> i = jsonGenres.getElements(); i.hasNext();) {
-			JsonNode jsonGenre = (JsonNode)i.next();
-			genres.add(new Genre(
-				getInt(jsonGenre, "genreid"), 
-				getString(jsonGenre, "label") 
-			));
+		final JsonNode jsonGenres = (result == null ? null : result.get("genres"));
+		if (jsonGenres != null) {
+			for (Iterator<JsonNode> i = jsonGenres.getElements(); i.hasNext(); ) {
+				JsonNode jsonGenre = (JsonNode) i.next();
+				genres.add(new Genre(
+						getInt(jsonGenre, "genreid"),
+						getString(jsonGenre, "label")
+				));
+			}
 		}
 		return genres;
 	}