Improved error handling.
Start of theming