diff --git a/factory/declarations.py b/factory/declarations.py
index 40ae99c4..e6621bd6 100644
--- a/factory/declarations.py
+++ b/factory/declarations.py
@@ -490,7 +490,7 @@ def evaluate_post(self, instance, step, overrides):
             return target
 
     def evaluate_pre(self, instance, step, overrides):
-        choice = self.decider.evaluate(instance=instance, step=step, extra={})
+        choice = self.decider.evaluate_pre(instance=instance, step=step, overrides={})
         target = self.yes if choice else self.no
 
         if isinstance(target, BaseDeclaration):
diff --git a/factory/faker.py b/factory/faker.py
index 7f9462be..6ed2e28c 100644
--- a/factory/faker.py
+++ b/factory/faker.py
@@ -43,7 +43,7 @@ def __init__(self, provider, **kwargs):
             **kwargs)
 
     def evaluate(self, instance, step, extra):
-        locale = extra.pop('locale', None)
+        locale = extra.pop('locale')
         subfaker = self._get_faker(locale)
         return subfaker.format(self.provider, **extra)