Added Partials and Added clearer error messages