Tweak to handle `nil` time