CDB-2810 - added error + fixed date problem