Hot fix error: update the date handling method to catch all types of exception