added error messages partial and extract partials