diff --git a/homeassistant/components/automation/event.py b/homeassistant/components/automation/event.py
index 20ea556f450..7c035d7d1a5 100644
--- a/homeassistant/components/automation/event.py
+++ b/homeassistant/components/automation/event.py
@@ -31,7 +31,7 @@ def async_trigger(hass, config, action):
     event_type = config.get(CONF_EVENT_TYPE)
     event_data_schema = vol.Schema(
         config.get(CONF_EVENT_DATA),
-        extra=vol.ALLOW_EXTRA) if CONF_EVENT_DATA in config else None
+        extra=vol.ALLOW_EXTRA) if config.get(CONF_EVENT_DATA) else None
 
     @callback
     def handle_event(event):
diff --git a/homeassistant/helpers/entity_component.py b/homeassistant/helpers/entity_component.py
index e805f277483..f6e9c1da7f8 100644
--- a/homeassistant/helpers/entity_component.py
+++ b/homeassistant/helpers/entity_component.py
@@ -370,12 +370,6 @@ class EntityPlatform(object):
 
     def add_entities(self, new_entities, update_before_add=False):
         """Add entities for a single platform."""
-        # That avoid deadlocks
-        if update_before_add:
-            self.component.logger.warning(
-                "Call 'add_entities' with update_before_add=True "
-                "only inside tests or you can run into a deadlock!")
-
         run_coroutine_threadsafe(
             self.async_add_entities(list(new_entities), update_before_add),
             self.component.hass.loop).result()