diff --git a/filter_plugins/ip_from_inventory.py b/filter_plugins/ip_from_inventory.py
index 3cde075..992c24e 100644
--- a/filter_plugins/ip_from_inventory.py
+++ b/filter_plugins/ip_from_inventory.py
@@ -5,10 +5,10 @@ def ip_from_inventory(hostvars, hostname):
     replace this ``{{ hostvars[hostname]['ansible_host'] }}``
     with something nicer such as `` {{ hostvars | ip_from_inventory(hostname) }}``
     """
-    try:
-        return hostvars[hostname]['ansible_host']
-    except KeyError:
-        raise AnsibleError('hostname "{hostname}" not found in inventory'.format(hostname=hostname))
+    if not hostname in hostvars:
+        raise AnsibleError('<ip_from_inventory> hostname "{hostname}" not found in inventory'.format(hostname=hostname))
+
+    return hostvars[hostname]['ansible_host']
 
 class FilterModule(object):
     def filters(self):