Throw an error for unrecoverable exceptions.
Refactored code.
Added default servlet.