Added missing exception, fixe date object bug