Bugfix for Calendar

More date object exceptions.