diff --git a/homeassistant/exceptions.py b/homeassistant/exceptions.py
index bd32d356670..510bc9b4e54 100644
--- a/homeassistant/exceptions.py
+++ b/homeassistant/exceptions.py
@@ -14,3 +14,10 @@ class InvalidEntityFormatError(HomeAssistantError):
 class NoEntitySpecifiedError(HomeAssistantError):
     """ When no entity is specified. """
     pass
+
+
+class TemplateError(HomeAssistantError):
+    """ Error during template rendering. """
+    def __init__(self, exception):
+        super().__init__('{}: {}'.format(exception.__class__.__name__,
+                                         exception))
diff --git a/homeassistant/util/template.py b/homeassistant/util/template.py
index bc89d053e60..b7fc3197e08 100644
--- a/homeassistant/util/template.py
+++ b/homeassistant/util/template.py
@@ -6,7 +6,12 @@ Template utility methods for rendering strings with HA data.
 """
 # pylint: disable=too-few-public-methods
 import json
+import logging
+import jinja2
 from jinja2.sandbox import ImmutableSandboxedEnvironment
+from homeassistant.exceptions import TemplateError
+
+_LOGGER = logging.getLogger(__name__)
 
 
 def render_with_possible_json_value(hass, template, value):
@@ -20,7 +25,11 @@ def render_with_possible_json_value(hass, template, value):
     except ValueError:
         pass
 
-    return render(hass, template, variables)
+    try:
+        return render(hass, template, variables)
+    except TemplateError:
+        _LOGGER.exception('Error parsing value')
+        return value
 
 
 def render(hass, template, variables=None, **kwargs):
@@ -28,9 +37,12 @@ def render(hass, template, variables=None, **kwargs):
     if variables is not None:
         kwargs.update(variables)
 
-    return ENV.from_string(template, {
-        'states': AllStates(hass)
-    }).render(kwargs)
+    try:
+        return ENV.from_string(template, {
+            'states': AllStates(hass)
+        }).render(kwargs)
+    except jinja2.TemplateError as err:
+        raise TemplateError(err)
 
 
 class AllStates(object):
diff --git a/tests/util/test_template.py b/tests/util/test_template.py
index bbb4de31626..16e1f8b6a04 100644
--- a/tests/util/test_template.py
+++ b/tests/util/test_template.py
@@ -7,7 +7,7 @@ Tests Home Assistant util methods.
 # pylint: disable=too-many-public-methods
 import unittest
 import homeassistant.core as ha
-
+from homeassistant.exceptions import TemplateError
 from homeassistant.util import template
 
 
@@ -84,3 +84,7 @@ class TestUtilTemplate(unittest.TestCase):
             '',
             template.render_with_possible_json_value(
                 self.hass, '{{ value_json }}', '{ I AM NOT JSON }'))
+
+    def test_raise_exception_on_error(self):
+        with self.assertRaises(TemplateError):
+            template.render(self.hass, '{{ invalid_syntax')