diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f37df92da436fcd019b1bb9dc81c2d576ed4a6b6..616f00b315b1e3e00f52ed1c735a6a2221e99d99 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@
 CCK 6.2-dev
 ===========
 
+- #318224 by brmassa, fix several errors in Content Copy.
 - #318387 Make sure old fieldgroup updates don't run if tables were never created.
 - #318227 Clean up update abort logic to more clearly explain what still needs to be done, add a helper function to prevent dangerous database operations until database is updated.
 - #317232 Change css file name from content.css to content-module.css to avoid namespace collisions.
diff --git a/modules/content_copy/content_copy.module b/modules/content_copy/content_copy.module
index 6b9c00778c4ecb896fde65b0ec76db18c87d1fa1..db7b55be45cb11e9dde72f0a405bc0ff0dd2e729 100644
--- a/modules/content_copy/content_copy.module
+++ b/modules/content_copy/content_copy.module
@@ -407,7 +407,7 @@ function content_copy_import_form_submit($form, &$form_state) {
 
     if (!empty($field['field_name']) && isset($content_info['content types'][$type_name]['fields'][$field_name])) {
       drupal_set_message(t('The imported field %field_label (%field_name) was not added to %type because that field already exists in %type.', array(
-        '%field_label' => $field_label, '%field_name' => $field_name, '%type' => $type_name)));
+        '%field_label' => $field['label'], '%field_name' => $field_name, '%type' => $type_name)));
     }
     else {
 
@@ -430,7 +430,7 @@ function content_copy_import_form_submit($form, &$form_state) {
  */
 function content_copy_form_alter(&$form, &$form_state, $form_id) {
   $alter_forms = array('node_type_form', 'content_field_edit_form', 'fieldgroup_group_edit_form');
-  if (isset($GLOBALS['content_copy']) && $GLOBALS['content_copy']['status'] == 'export' && in_array($form_id, $alter_forms)) {
+  if (isset($GLOBALS['content_copy']) && isset($GLOBALS['content_copy']['status']) && $GLOBALS['content_copy']['status'] == 'export' && in_array($form_id, $alter_forms)) {
     $form['#submit'][] = 'content_copy_record_macro';
   }
 }