Fixed conversion of null to Instant