diff --git a/date_elements.inc b/date_elements.inc
index 656d499..462bc18 100644
--- a/date_elements.inc
+++ b/date_elements.inc
@@ -292,6 +292,9 @@ function date_combo_element_process($element, &$form_state, $form) {
   $process = date_process_values($field, $instance);
   foreach ($process as $processed) {
     if (!isset($element['#default_value'][$processed])) {
+      if (empty($element['#default_value']) || !is_array($element['#default_value'])) {
+        $element['#default_value'] = array();
+      }
       $element['#default_value'][$processed] = '';
     }
     $date = date_local_date($element['#default_value'], $element['#date_timezone'], $field, $instance, $processed);
diff --git a/date_repeat/tests/date_repeat_form.test b/date_repeat/tests/date_repeat_form.test
index 22d6529..76d2640 100644
--- a/date_repeat/tests/date_repeat_form.test
+++ b/date_repeat/tests/date_repeat_form.test
@@ -496,7 +496,7 @@ class DateRepeatFormTestCase extends DrupalWebTestCase {
 
   function deleteDateField() {
     $this->drupalGet('admin/structure/types/manage/date/fields');
-    $this->clickLink('delete');
+    $this->clickLink('delete', 1);
     $this->drupalPost(NULL, NULL, t('Delete'));
     $this->assertText(t('The field Test has been deleted from the Date content type.'), t('Removed date field.'));
   }
diff --git a/date_tools/tests/date_tools.test b/date_tools/tests/date_tools.test
index 07af4a3..d162e61 100644
--- a/date_tools/tests/date_tools.test
+++ b/date_tools/tests/date_tools.test
@@ -76,7 +76,7 @@ class DateToolsTestCase extends DrupalWebTestCase {
    */
   function deleteDateField() {
     $this->drupalGet('admin/structure/types/manage/story/fields');
-    $this->clickLink('delete');
+    $this->clickLink('delete', 1);
     $this->drupalPost(NULL, NULL, t('Delete'));
     $this->assertText('The field Test has been deleted from the Story content type.', 'Removed date field.');
   }
diff --git a/tests/date_field.test b/tests/date_field.test
index b8aad59..463ddae 100644
--- a/tests/date_field.test
+++ b/tests/date_field.test
@@ -273,7 +273,7 @@ abstract class DateFieldBasic extends DrupalWebTestCase {
    */
   protected function deleteDateField($label, $bundle = 'story', $bundle_name = 'Story') {
     $this->drupalGet("admin/structure/types/manage/$bundle/fields");
-    $this->clickLink('delete');
+    $this->clickLink('delete', 1);
     $this->drupalPost(NULL, NULL, t('Delete'));
     $this->assertText("The field $label has been deleted from the $bundle_name content type.", 'Removed date field.');
   }