changing so that errors to template are caught as errors and result in the default site being displayed
merging mike updates, catching more template exceptions, displaying the error