--- a/piecrust/appconfig.py	Fri Jan 01 23:18:26 2016 -0800
+++ b/piecrust/appconfig.py	Sat Jan 02 16:39:26 2016 -0800
@@ -78,21 +78,25 @@
 
         logger.debug("Loading configuration from: %s" % self.paths)
         values = {}
-        for i, p in enumerate(self.paths):
-            with open(p, 'r', encoding='utf-8') as fp:
-                loaded_values = yaml.load(
-                        fp.read(),
-                        Loader=ConfigurationLoader)
-            if loaded_values is None:
-                loaded_values = {}
+        try:
+            for i, p in enumerate(self.paths):
+                with open(p, 'r', encoding='utf-8') as fp:
+                    loaded_values = yaml.load(
+                            fp.read(),
+                            Loader=ConfigurationLoader)
+                if loaded_values is None:
+                    loaded_values = {}
+                for fixup in self.fixups:
+                    fixup(i, loaded_values)
+                merge_dicts(values, loaded_values)
+
             for fixup in self.fixups:
-                fixup(i, loaded_values)
-            merge_dicts(values, loaded_values)
+                fixup(len(self.paths), values)
 
-        for fixup in self.fixups:
-            fixup(len(self.paths), values)
-
-        self._values = self._validateAll(values)
+            self._values = self._validateAll(values)
+        except Exception as ex:
+            raise Exception("Error loading configuration from: %s" %
+                            ', '.join(self.paths)) from ex
 
         logger.debug("Caching configuration...")
         self._values['__cache_key'] = cache_key
@@ -129,7 +133,11 @@
             callback_name = '_validate_' + path.replace('/', '_')
             callback = globs.get(callback_name)
             if callback:
-                val2 = callback(val, values, cache_writer)
+                try:
+                    val2 = callback(val, values, cache_writer)
+                except Exception as ex:
+                    raise Exception("Error raised in validator '%s'." %
+                                    callback_name) from ex
                 if val2 is None:
                     raise Exception("Validator '%s' isn't returning a "
                                     "coerced value." % callback_name)
@@ -143,9 +151,6 @@
         dcmcopy = copy.deepcopy(default_content_model_base)
         values = merge_dicts(dcmcopy, values)
 
-        dcm = get_default_content_model(values)
-        values = merge_dicts(dcm, values)
-
         blogsc = values['site'].get('blogs')
         if blogsc is None:
             blogsc = ['posts']
@@ -157,6 +162,9 @@
                     blog_name, is_only_blog, values)
             values = merge_dicts(blog_cfg, values)
 
+        dcm = get_default_content_model(values)
+        values = merge_dicts(dcm, values)
+
         return values
 
 
@@ -184,6 +192,7 @@
                 ('md', 'markdown'),
                 ('textile', 'textile')]),
             'default_auto_format': 'md',
+            'default_pagination_source': None,
             'pagination_suffix': '/%num%',
             'slugify_mode': 'encode',
             'themes_sources': [DEFAULT_THEME_SOURCE],
@@ -193,7 +202,9 @@
             'use_default_content': True
             }),
         'baker': collections.OrderedDict({
-            'no_bake_setting': 'draft'
+            'no_bake_setting': 'draft',
+            'workers': None,
+            'batch_size': None
             })
         })
 
@@ -426,6 +437,9 @@
 
     # Sources have the `default` scanner by default, duh. Also, a bunch
     # of other default values for other configuration stuff.
+    reserved_endpoints = set(['piecrust', 'site', 'page', 'route',
+                              'assets', 'pagination', 'siblings',
+                              'family'])
     for sn, sc in v.items():
         if not isinstance(sc, dict):
             raise ConfigurationError("All sources in 'site/sources' must "
@@ -440,6 +454,13 @@
         sc.setdefault('date_format', DEFAULT_DATE_FORMAT)
         sc.setdefault('realm', REALM_USER)
 
+        # Validate endpoints.
+        endpoint = sc['data_endpoint']
+        if endpoint in reserved_endpoints:
+            raise ConfigurationError(
+                    "Source '%s' is using a reserved endpoint name: %s" %
+                    (sn, endpoint))
+
     return v
 
 
@@ -479,17 +500,6 @@
         tc.setdefault('term', tn)
         tc.setdefault('page', '_%s.%%ext%%' % tc['term'])
 
-    # Validate endpoints, and make sure the theme has a default source.
-    reserved_endpoints = set(['piecrust', 'site', 'page', 'route',
-                              'assets', 'pagination', 'siblings',
-                              'family'])
-    for name, src in values['site']['sources'].items():
-        endpoint = src['data_endpoint']
-        if endpoint in reserved_endpoints:
-            raise ConfigurationError(
-                    "Source '%s' is using a reserved endpoint name: %s" %
-                    (name, endpoint))
-
     return v
 
 

--- a/tests/cli/test_find.yaml	Fri Jan 01 23:18:26 2016 -0800
+++ b/tests/cli/test_find.yaml	Sat Jan 02 16:39:26 2016 -0800
@@ -15,8 +15,8 @@
     pages/foo.md: ''
     posts/2015-01-10_blah.md: ''
 out: |
+    pages/foo.md
     posts/2015-01-10_blah.md
-    pages/foo.md
 ---
 args: find foo
 replace_out_path_sep: true

--- a/tests/test_appconfig.py	Fri Jan 01 23:18:26 2016 -0800
+++ b/tests/test_appconfig.py	Sat Jan 02 16:39:26 2016 -0800
@@ -29,7 +29,7 @@
     config = PieCrustConfiguration(values=values)
     # The order of routes is important. Sources, not so much.
     assert list(map(lambda v: v['source'], config.get('site/routes'))) == [
-            'notes', 'pages', 'posts', 'posts', 'posts', 'theme_pages']
+            'notes', 'posts', 'posts', 'posts', 'pages', 'theme_pages']
     assert list(config.get('site/sources').keys()) == [
-            'posts', 'pages', 'notes', 'theme_pages']
+            'pages', 'posts', 'notes', 'theme_pages']