1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/ui/cocoa/tab_contents/favicon_util.mm b/chrome/browser/ui/cocoa/tab_contents/favicon_util.mm
index 390b8f9..3fcba52 100644
--- a/chrome/browser/ui/cocoa/tab_contents/favicon_util.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/favicon_util.mm
@@ -19,8 +19,14 @@ NSImage* FaviconForTabContents(TabContents* contents) {
   // favicon.
   if (contents && contents->FaviconIsValid()) {
     CGColorSpaceRef color_space = base::mac::GetSystemColorSpace();
-    return gfx::SkBitmapToNSImageWithColorSpace(contents->GetFavicon(),
-                                                color_space);
+    NSImage* image =
+        gfx::SkBitmapToNSImageWithColorSpace(contents->GetFavicon(),
+                                             color_space);
+    // The |image| could be nil if the bitmap is null. In that case, fallback
+    // to the default image.
+    if (image) {
+      return image;
+    }
   }
 
   return app::mac::GetCachedImageWithName(@"nav.pdf");