diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicDirectory.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicDirectory.java
index 5d3d4786..e0a72f6a 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicDirectory.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicDirectory.java
@@ -18,6 +18,8 @@
  */
 package org.moire.ultrasonic.domain;
 
+import android.support.annotation.NonNull;
+
 import java.io.Serializable;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -352,6 +354,7 @@ public class MusicDirectory
 			this.bitRate = bitRate;
 		}
 
+		@NonNull
 		public String getCoverArt()
 		{
 			return coverArt;
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadFile.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadFile.java
index 9364fb2f..3c7d9ef4 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadFile.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadFile.java
@@ -21,6 +21,7 @@ package org.moire.ultrasonic.service;
 import android.content.Context;
 import android.net.wifi.WifiManager;
 import android.os.PowerManager;
+import android.text.TextUtils;
 import android.util.Log;
 
 import org.moire.ultrasonic.domain.MusicDirectory;
@@ -457,8 +458,7 @@ public class DownloadFile
 		{
 			try
 			{
-				if (song.getCoverArt() != null)
-				{
+				if (!TextUtils.isEmpty(song.getCoverArt())) {
 					int size = Util.getMinDisplayMetric(context);
 					musicService.getCoverArt(context, song, size, true, true, null);
 				}
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java
index d9c7ca7d..43b7c9e7 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java
@@ -23,6 +23,7 @@ import android.graphics.Bitmap;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
+import android.text.TextUtils;
 import android.util.Log;
 
 import org.moire.ultrasonic.R;
@@ -654,7 +655,7 @@ public class RESTMusicService implements MusicService {
                 Log.d(TAG, "Loading cover art for: " + entry);
 
                 final String id = entry.getCoverArt();
-                if (id == null || id.isEmpty()) {
+                if (TextUtils.isEmpty(id)) {
                     return null; // Can't load
                 }
 
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java
index e885d24f..2a64aa10 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java
@@ -22,6 +22,7 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Environment;
+import android.text.TextUtils;
 import android.util.Log;
 
 import org.moire.ultrasonic.activity.SubsonicTabActivity;
@@ -324,13 +325,10 @@ public class FileUtil
 
 		File dir;
 
-		if (entry.getPath() != null)
-		{
+		if (!TextUtils.isEmpty(entry.getPath())) {
 			File f = new File(fileSystemSafeDir(entry.getPath()));
 			dir = new File(String.format("%s/%s", getMusicDirectory(context).getPath(), entry.isDirectory() ? f.getPath() : f.getParent()));
-		}
-		else
-		{
+		} else {
 			String artist = fileSystemSafe(entry.getArtist());
 			String album = fileSystemSafe(entry.getAlbum());
 
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/ImageLoader.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ImageLoader.java
index 6391e66d..60fe1b49 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/ImageLoader.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ImageLoader.java
@@ -25,6 +25,7 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
 import android.os.Handler;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
@@ -179,8 +180,7 @@ public class ImageLoader implements Runnable
 
 		String coverArt = entry.getCoverArt();
 
-		if (coverArt == null)
-		{
+		if (TextUtils.isEmpty(coverArt)) {
 			setUnknownImage(view, large);
 			return;
 		}
@@ -230,8 +230,7 @@ public class ImageLoader implements Runnable
 
 		String coverArt = entry.getCoverArt();
 
-		if (coverArt == null)
-		{
+		if (TextUtils.isEmpty(coverArt)) {
 			return null;
 		}