Merge "Exception: Clean up html document for error pages"