Index: wp-includes/general-template.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- wp-includes/general-template.php	(revision 08f71faac3495444245f30bb08a9691338f7292a)
+++ wp-includes/general-template.php	(revision )
@@ -734,10 +734,19 @@
  * @return string Site Icon URL.
  */
 function get_site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
-	if ( $blog_id && is_multisite() ) {
+	if ($blog_id && is_multisite()) {
 		$site_icon_id = get_blog_option( $blog_id, 'site_icon' );
+
+		if ($site_icon_id === false) {
+			update_blog_option( $blog_id, 'site_icon', 0 );
+		}
+
 	} else {
 		$site_icon_id = get_option( 'site_icon' );
+
+		if ($site_icon_id === false) {
+			update_option( 'site_icon', 0 );
+		}
 	}
 
 	if ( $site_icon_id ) {