diff --git a/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java b/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java
index afa95d869..8c17945a6 100644
--- a/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java
+++ b/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java
@@ -78,6 +78,10 @@ public class MediaWikiImageView extends ImageView {
             return;
         }
 
+        if(mMedia == null) {
+            return;
+        }
+
         final String  mUrl;
         if(tryOriginal) {
             mUrl = mMedia.getImageUrl();
@@ -172,9 +176,7 @@ public class MediaWikiImageView extends ImageView {
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
-        Log.d("Commons", "Called via onLayout");
         loadImageIfNecessary(true);
-        // Called via onLayout
     }
 
     @Override