changed time zone and added error handler