diff -upr feedapi_mapper.orig/mappers/feedapi_mapper_date.inc feedapi_mapper/mappers/feedapi_mapper_date.inc
--- feedapi_mapper.orig/mappers/feedapi_mapper_date.inc	2009-04-30 12:36:07.000000000 -0700
+++ feedapi_mapper/mappers/feedapi_mapper_date.inc	2009-06-28 18:03:10.000000000 -0700
@@ -401,12 +401,17 @@ class date_constructor {
       $this->value['date2'] = date_create($this->end_datetime, timezone_open($this->to_tz));      
     }
     
-    $this->value['offset'] = date_offset_get($this->value['date']);
-    $this->value['offset2'] = date_offset_get($this->value['date2']);
-    date_timezone_set($this->value['date'], timezone_open($this->db_tz));
-    date_timezone_set($this->value['date2'], timezone_open($this->db_tz));
-    $this->value['value'] = date_format($this->value['date'], $this->format);
-    $this->value['value2'] = date_format($this->value['date2'], $this->format);
+    if ($this->value['date']) {
+      $this->value['offset'] = date_offset_get($this->value['date']);
+      date_timezone_set($this->value['date'], timezone_open($this->db_tz));
+      $this->value['value'] = date_format($this->value['date'], $this->format);
+    }
+    if ($this->value['date2']) {
+      $this->value['offset2'] = date_offset_get($this->value['date2']);
+      date_timezone_set($this->value['date2'], timezone_open($this->db_tz));
+      $this->value['value2'] = date_format($this->value['date2'], $this->format);
+	}
+
     $this->value['timezone'] = $this->to_tz;
   }
 }
\ No newline at end of file