Updates to handle errors in timestamp data