diff --git a/ChangeLog b/ChangeLog
index eded2eca5a..36a0332c70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 13 01:48:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/date.rb (Date::self.complete_hash): need to check if g is
+	  nil before dereference.  [ruby-core:09116]
+
 Fri Oct 13 01:05:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_partition): RDoc update.  a patch from
diff --git a/lib/date.rb b/lib/date.rb
index dcc673bed7..1c9901534a 100644
--- a/lib/date.rb
+++ b/lib/date.rb
@@ -797,7 +797,7 @@ class Date
       end
     end
 
-    if g[0] == :time
+    if g && g[0] == :time
       if self <= DateTime
 	d ||= Date.today
 	elem[:jd] ||= d.jd