diff --git a/core/modules/color/color.module b/core/modules/color/color.module
old mode 100644
new mode 100755
index 8cc6223..1eacf06
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -94,7 +94,7 @@ function color_preprocess_page(&$variables) {
 
   // Override logo.
   $logo = \Drupal::config('color.' . $theme_key)->get('logo');
-  if ($logo && $variables['logo'] && preg_match('!' . $theme_key . '/logo.png$!', $variables['logo'])) {
+  if (file_exists($logo) && $vars['logo'] && preg_match('!' . $theme_key . '/logo.png$!', $vars['logo'])) {
     $variables['logo'] = file_create_url($logo);
   }
 }
@@ -353,12 +353,14 @@ function color_scheme_form_submit($form, &$form_state) {
     ->save();
 
   // Copy over neutral images.
-  foreach ($info['copy'] as $file) {
-    $base = drupal_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.
diff --git a/core/themes/bartik/color/color.inc b/core/themes/bartik/color/color.inc
index f70450c..4c76944 100644
--- a/core/themes/bartik/color/color.inc
+++ b/core/themes/bartik/color/color.inc
@@ -100,11 +100,6 @@
     'css/colors.css',
   ),
 
-  // Files to copy.
-  'copy' => array(
-    'logo.png',
-  ),
-
   // Gradient definitions.
   'gradients' => array(
     array(