Tidied up error reporting in demo to prevent:

- Duplicate exception message display
- Error message text not being HTML escaped