Add check on errors
Add unified format of date