Index: TECH/DateTime.cls.xml
===================================================================
diff -u -r2212 -r2257
--- TECH/DateTime.cls.xml	(.../DateTime.cls.xml)	(revision 2212)
+++ TECH/DateTime.cls.xml	(.../DateTime.cls.xml)	(revision 2257)
@@ -49,7 +49,10 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Timestamp:%TimeStamp</FormalSpec>
 <ReturnType>%Date</ReturnType>
-<Implementation><![CDATA[	Quit $zdh(Timestamp,3)
+<Implementation><![CDATA[
+	Set Date = ""
+	If (Timestamp '= "") Set Date = $zdh(Timestamp,3)
+	Quit Date
 ]]></Implementation>
 </Method>
 
@@ -65,7 +68,10 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Date:%Date</FormalSpec>
 <ReturnType>%TimeStamp</ReturnType>
-<Implementation><![CDATA[	Quit $zd(Date,3)_" 00:00:00"
+<Implementation><![CDATA[
+	Set TimeStamp = ""
+	If (Date '= "") Set TimeStamp = $zd(Date,3)_" 00:00:00"
+	Quit TimeStamp
 ]]></Implementation>
 </Method>