return null when timestamp value is null instead of epoch default ts

return null when timestamp value is null instead of epoch default ts #422