Updates from as4

- Exception handling
- International site