diff --git a/goblin/exception.py b/goblin/exception.py
index 51f0ea5967de894e2e8fd6e64c936d37cd6bf17b..aa4698a238371f09b8a31b61a4c14b7375e5bc25 100644
--- a/goblin/exception.py
+++ b/goblin/exception.py
@@ -6,7 +6,7 @@ class ClientError(Exception):
     pass
 
 
-class MappingError(Exception):
+class MappingError(AttributeError):
     pass
 
 
diff --git a/goblin/mapper.py b/goblin/mapper.py
index c7cacbb71950f55c1d307ba5bf625c403b6182e2..efb4616de3cf1918193004beec83a558dc7cddef 100644
--- a/goblin/mapper.py
+++ b/goblin/mapper.py
@@ -215,7 +215,7 @@ class Mapping:
         try:
             mapping, _ = self._ogm_properties[value]
             return mapping
-        except:
+        except KeyError:
             raise exception.MappingError(
                 "unrecognized property {} for class: {}".format(
                     value, self._element_type))