--- phptemplate.engine	2007-04-19 13:54:58.000000000 -0600
+++ phptemplate copy.engine	2007-04-19 13:51:42.000000000 -0600
@@ -155,7 +155,7 @@
   }
 
   /* Add favicon */
-  if (theme_get_setting('toggle_favicon')) {
+  if (theme_get_setting('toggle_favicon') && theme_get_setting('favicon')) {
     drupal_set_html_head('<link rel="shortcut icon" href="'. check_url(theme_get_setting('favicon')) .'" type="image/x-icon" />');
   }