diff --git a/README.rst b/README.rst
index c4a41f8..1e42a95 100644
--- a/README.rst
+++ b/README.rst
@@ -476,6 +476,21 @@
    :language: yaml
 
 
+Common salt config options
+--------------------------
+
+Pass pillar render error to minion log.
+
+.. Note: When set to `False` this option is great for debuging. However it is not recomended for
+         any production environment as it may contain templating data as passwords, etc...,
+         that minion should not have.
+
+.. code-block:: yaml
+
+    salt:
+      master:
+        pillar_safe_render_error: False
+
 Salt minion
 -----------
 
diff --git a/salt/files/master.conf b/salt/files/master.conf
index 5ee0adb..1802d82 100644
--- a/salt/files/master.conf
+++ b/salt/files/master.conf
@@ -40,6 +40,8 @@
 
 pillar_opts: False
 
+pillar_safe_render_error: {{ master.pillar_safe_render_error }}
+
 {%- if master.accept_policy == 'open_mode' %}
 open_mode: True
 {%- endif %}
diff --git a/salt/map.jinja b/salt/map.jinja
index 3a36ada..e238877 100644
--- a/salt/map.jinja
+++ b/salt/map.jinja
@@ -19,6 +19,7 @@
   base_environment: dev
   dir:
     files: /srv/salt/env
+  pillar_safe_render_error: true
   pillar:
     engine: salt
   max_event_size: 100000000
diff --git a/tests/pillar/master_single_extpillars.sls b/tests/pillar/master_single_extpillars.sls
index 03521eb..d2d2422 100644
--- a/tests/pillar/master_single_extpillars.sls
+++ b/tests/pillar/master_single_extpillars.sls
@@ -17,6 +17,7 @@
     command_timeout: 5
     worker_threads: 2
     base_environment: prd
+    pillar_safe_render_error: False
     #environment:
     # prd:
     #   formula: