Add error on date special case and add test to verify