diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaUtils.java
index f849e859efc2..bd09b76fb3ae 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaUtils.java
@@ -21,7 +21,6 @@
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.WordPressDB;
-import org.wordpress.android.models.Blog;
 import org.wordpress.android.models.MediaFile;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
@@ -131,7 +130,9 @@ protected Bitmap doInBackground(Uri... params) {
                 if (bitmap == null) {
                     URL url = new URL(uri);
                     bitmap = BitmapFactory.decodeStream(url.openConnection().getInputStream());
-                    WordPress.getBitmapCache().put(uri, bitmap);
+                    if (bitmap != null) {
+                        WordPress.getBitmapCache().put(uri, bitmap);
+                    }
                 }
 
                 return bitmap;
@@ -145,7 +146,7 @@ protected Bitmap doInBackground(Uri... params) {
         protected void onPostExecute(Bitmap result) {
             ImageView imageView = mReference.get();
 
-            if (imageView != null) {
+            if (imageView != null && result != null) {
                 if (imageView.getTag() == this) {
                     imageView.setImageBitmap(result);
                     fadeInImage(imageView, result);