DateConversion exception fix