diff --git a/src/com/android/contacts/list/ContactPhotoLoader.java b/src/com/android/contacts/list/ContactPhotoLoader.java
index 8681a4a..83e9131 100644
--- a/src/com/android/contacts/list/ContactPhotoLoader.java
+++ b/src/com/android/contacts/list/ContactPhotoLoader.java
@@ -335,6 +335,7 @@
             ArrayList<String> photoIdsAsStrings, ArrayList<Uri> uris) {
         photoIds.clear();
         photoIdsAsStrings.clear();
+        uris.clear();
 
         /*
          * Since the call is made from the loader thread, the map could be
@@ -464,6 +465,9 @@
                         }
                         cacheBitmap(uri, baos.toByteArray());
                         mMainThreadHandler.sendEmptyMessage(MESSAGE_PHOTOS_LOADED);
+                    } else {
+                        Log.v(TAG, "Cannot load photo " + uri);
+                        cacheBitmap(uri, null);
                     }
                 } catch (Exception ex) {
                     Log.v(TAG, "Cannot load photo " + uri, ex);