--- a/mobile/android/base/java/org/mozilla/gecko/icons/loader/SuggestedSiteLoader.java
+++ b/mobile/android/base/java/org/mozilla/gecko/icons/loader/SuggestedSiteLoader.java
@@ -64,16 +64,17 @@ public class SuggestedSiteLoader impleme
         final String iconLocation = suggestedSites.getImageUrlForUrl(siteURL);
         final String backgroundColorString = suggestedSites.getBackgroundColorForUrl(siteURL);
 
         if (iconLocation == null || backgroundColorString == null) {
             // There's little we can do if loading a bundled resource fails: this failure could
             // be caused by a distribution (as opposed to Gecko), so we should just shout loudly,
             // as opposed to crashing:
             Log.e(LOGTAG, "Unable to find tile data definitions for site:" + siteURL);
+            return null;
         }
 
         final int backgroundColor = Color.parseColor(backgroundColorString);
 
         try {
             final Bitmap foreground = loadBitmap(context, iconLocation);
 
             // Our supplied tile icons are bigger than the max favicon size. They are also not square,,

--- a/mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/loader/TestSuggestedSiteLoader.java
+++ b/mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/loader/TestSuggestedSiteLoader.java
@@ -125,16 +125,26 @@ public class TestSuggestedSiteLoader {
             final Bitmap out = response.getBitmap();
             final int expectedSize = context.getResources().getDimensionPixelSize(R.dimen.favicon_bg);
             Assert.assertEquals(expectedSize, out.getWidth());
             Assert.assertEquals(expectedSize, out.getWidth());
         }
     }
 
     @Test
+    public void testLoadingOtherIconFailsCleanly() throws IOException {
+        // Ensure that we return null (instead of crashing or providing wrong data) for a fake
+        // topsite.
+        final IconResponse response = loadIconForSite("http://www.arbitrary-not-bunled-site.notreal", false);
+
+        Assert.assertNull(response);
+    }
+
+
+    @Test
     public void testRespectsSkipDisk() throws IOException {
         for (final String site : DEFAULT_SUGGESTED_SITES_ICONS) {
             final IconResponse response = loadIconForSite(site, true);
 
             Assert.assertNull(response);
         }
     }
 }