Cleaned up some catch blocks.