Index: modules/color/color.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/color/color.module,v
retrieving revision 1.90
diff -u -r1.90 color.module
--- modules/color/color.module	17 Aug 2010 22:05:22 -0000	1.90
+++ modules/color/color.module	20 Aug 2010 22:54:30 -0000
@@ -106,7 +106,7 @@
 
   // Override logo.
   $logo = variable_get('color_' . $theme_key . '_logo');
-  if ($logo && $vars['logo'] && preg_match('!' . $theme_key . '/logo.png$!', $vars['logo'])) {
+  if (file_exists($logo) && $vars['logo'] && preg_match('!' . $theme_key . '/logo.png$!', $vars['logo'])) {
     $vars['logo'] = file_create_url($logo);
   }
 }
@@ -244,11 +244,11 @@
   $info = $form['info']['#value'];
   $path = drupal_get_path('theme', $theme) . '/';
   drupal_add_css($path . $info['preview_css']);
-  
+
   $preview_js_path = isset($info['preview_js']) ? $path . $info['preview_js'] : drupal_get_path('module', 'color') . '/' . 'preview.js';
   // Add the JS at a weight below color.js.
   drupal_add_js($preview_js_path, array('weight' => JS_DEFAULT - 1));
-    
+
   $output  = '';
   $output .= '<div class="color-form clearfix">';
   // Color schemes
@@ -345,12 +345,14 @@
   variable_set('color_' . $theme . '_logo', $paths['target'] . 'logo.png');
 
   // Copy over neutral images.
-  foreach ($info['copy'] as $file) {
-    $base = basename($file);
-    $source = $paths['source'] . $file;
-    $filepath = file_unmanaged_copy($source, $paths['target'] . $base);
-    $paths['map'][$file] = $base;
-    $paths['files'][] = $filepath;
+  if (isset($info['copy'])) {
+    foreach ($info['copy'] as $file) {
+      $base = basename($file);
+      $source = $paths['source'] . $file;
+      $filepath = file_unmanaged_copy($source, $paths['target'] . $base);
+      $paths['map'][$file] = $base;
+      $paths['files'][] = $filepath;
+    }
   }
 
   // Render new images, if image has been provided.
Index: themes/bartik/color/color.inc
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/color/color.inc,v
retrieving revision 1.3
diff -u -r1.3 color.inc
--- themes/bartik/color/color.inc	18 Aug 2010 00:28:08 -0000	1.3
+++ themes/bartik/color/color.inc	20 Aug 2010 22:54:31 -0000
@@ -96,11 +96,6 @@
     'css/colors.css',
   ),
 
-  // Files to copy.
-  'copy' => array(
-    'logo.png',
-  ),
-
   // Gradient definitions.
   'gradients' => array(
     array(