Clean up catch blocks

- No need to have nested try blocks because the catch block catches everything and rethrows it
- No need to do instanceof-checks