update logic to ensure you are not accessing uninitialized dates (#1114)

update logic to ensure you are not accessing uninitialized dates (#1114) #608