--- loncom/homework/lonhomework.pm	2007/11/03 00:52:06	1.282
+++ loncom/homework/lonhomework.pm	2007/11/10 01:38:21	1.283
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.282 2007/11/03 00:52:06 albertel Exp $
+# $Id: lonhomework.pm,v 1.283 2007/11/10 01:38:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -543,7 +543,8 @@ sub due_date {
 	&Apache::lonxml::debug("looking for first_access $first_access");
 	if (defined($first_access)) {
 	    $interval = $first_access+$interval;
-	    $date = ($interval < $due_date)? $interval : $due_date;
+	    $date = (!$due_date || $interval < $due_date) ? $interval
+                                                          : $due_date;
 	} else {
 	    $date = $due_date;
 	}