diff --git a/astrid/src/com/todoroo/astrid/helper/AsyncImageView.java b/astrid/src/com/todoroo/astrid/helper/AsyncImageView.java
index 67aeff6a9..102538fde 100644
--- a/astrid/src/com/todoroo/astrid/helper/AsyncImageView.java
+++ b/astrid/src/com/todoroo/astrid/helper/AsyncImageView.java
@@ -46,8 +46,7 @@ public class AsyncImageView extends greendroid.widget.AsyncImageView {
         if (cacheImage != null && cacheURL.equals(url) && !TextUtils.isEmpty(url)) {
             setImageBitmap(cacheImage);
             return;
-        }
-        else if(imageDiskCache != null && imageDiskCache.contains(url)) {
+        } else if (url != null && imageDiskCache != null && imageDiskCache.contains(url)) {
             try {
                 cacheImage = imageDiskCache.get(url);
                 setImageBitmap(cacheImage);