Added some catch blocks

Files seems to be changed because I made changes to my local project and
then had to copy files over.