diff --git a/promenade/config.py b/promenade/config.py
index 837b5738..9205770c 100644
--- a/promenade/config.py
+++ b/promenade/config.py
@@ -5,6 +5,7 @@ import jsonpath_ng
 import yaml
 
 from deckhand.engine import layering
+from deckhand import errors as dh_errors
 
 __all__ = ['Configuration']
 
@@ -24,9 +25,18 @@ class Configuration:
         LOG.info("Building config from %d documents." % len(documents))
         if substitute:
             LOG.info("Rendering documents via Deckhand engine.")
-            deckhand_eng = layering.DocumentLayering(
-                documents, substitution_sources=documents)
-            documents = [dict(d) for d in deckhand_eng.render()]
+            try:
+                deckhand_eng = layering.DocumentLayering(
+                    documents,
+                    substitution_sources=documents,
+                    fail_on_missing_sub_src=False)
+                documents = [dict(d) for d in deckhand_eng.render()]
+            except dh_errors.DeckhandException as e:
+                LOG.exception(str(e))
+                LOG.error('An unknown Deckhand exception occurred while trying'
+                          ' to render documents.')
+                raise exceptions.DeckhandException(str(e))
+
             LOG.info("Deckhand engine returned %d documents." % len(documents))
         if validate:
             validation.check_schemas(documents, schemas=schema_set)
diff --git a/promenade/control/join_scripts.py b/promenade/control/join_scripts.py
index 5518cd89..957ad6e3 100644
--- a/promenade/control/join_scripts.py
+++ b/promenade/control/join_scripts.py
@@ -12,15 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from promenade.control.base import BaseResource
-from promenade.builder import Builder
-from promenade.config import Configuration
-from promenade import logging
-from promenade import policy
 import falcon
 import kubernetes
 import random
 
+from promenade.control.base import BaseResource
+from promenade.builder import Builder
+from promenade.config import Configuration
+from promenade import exceptions
+from promenade import logging
+from promenade import policy
+
 LOG = logging.getLogger(__name__)
 
 
@@ -40,7 +42,11 @@ class JoinScriptsResource(BaseResource):
 
         join_ip = _get_join_ip()
 
-        config = Configuration.from_design_ref(design_ref)
+        try:
+            config = Configuration.from_design_ref(design_ref)
+        except exceptions.DeckhandException as e:
+            raise falcon.HTTPInternalServerError(description=str(e))
+
         node_document = {
             'schema': 'promenade/KubernetesNode/v1',
             'metadata': {
diff --git a/promenade/exceptions.py b/promenade/exceptions.py
index 5a2cd1e3..69545b21 100644
--- a/promenade/exceptions.py
+++ b/promenade/exceptions.py
@@ -241,6 +241,11 @@ class ValidationException(PromenadeException):
     status = falcon.HTTP_400
 
 
+class DeckhandException(PromenadeException):
+    title = 'Deckhand Engine Error'
+    status = falcon.HTTP_500
+
+
 def massage_error_list(error_list, placeholder_description):
     """
     Returns a best-effort attempt to make a nice error list