Updated the files for catch errors