--- a/VersionInfo.st	Mon Nov 28 17:11:46 2016 +0000
+++ b/VersionInfo.st	Mon Nov 28 17:24:53 2016 +0000
@@ -255,7 +255,13 @@
 timestamp
     timestamp notNil ifTrue:[^ timestamp].
     date isNil ifTrue:[^ nil].
-    time isNil ifTrue:[^ date asTimestamp].
+    time isNil ifTrue:[
+        Error handle:[:ex |
+            ^ nil
+        ] do:[    
+            ^ date asTimestamp
+        ].
+    ].
     ^ Timestamp fromDate:date andTime:time
 !