Add check for nil timestamp (#1187)

Add check for nil timestamp (#1187) #445