Got some error pages working
Additional error handling changes
Updated the default templates