diff --git a/src/AppBundle/Command/AddUserCommand.php b/src/AppBundle/Command/AddUserCommand.php
index e1e8050f0..970d1b1d7 100644
--- a/src/AppBundle/Command/AddUserCommand.php
+++ b/src/AppBundle/Command/AddUserCommand.php
@@ -19,7 +19,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\Question;
-use Symfony\Component\Security\Core\Encoder\UserPasswordEncoder;
+use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 
 /**
  * A command console that creates users and stores them in the database.
@@ -47,7 +47,7 @@ class AddUserCommand extends Command
     private $entityManager;
     private $passwordEncoder;
 
-    public function __construct(EntityManagerInterface $em, UserPasswordEncoder $encoder)
+    public function __construct(EntityManagerInterface $em, UserPasswordEncoderInterface $encoder)
     {
         parent::__construct();
 
diff --git a/src/AppBundle/EventListener/CheckRequirementsSubscriber.php b/src/AppBundle/EventListener/CheckRequirementsSubscriber.php
index eac7644d9..647ae5e0f 100644
--- a/src/AppBundle/EventListener/CheckRequirementsSubscriber.php
+++ b/src/AppBundle/EventListener/CheckRequirementsSubscriber.php
@@ -12,9 +12,9 @@
 namespace AppBundle\EventListener;
 
 use Doctrine\DBAL\Exception\DriverException;
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Console\ConsoleEvents;
-use Symfony\Component\Console\Event\ConsoleExceptionEvent;
+use Symfony\Component\Console\Event\ConsoleErrorEvent;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
@@ -30,13 +30,13 @@
  */
 class CheckRequirementsSubscriber implements EventSubscriberInterface
 {
-    /** @var EntityManager */
+    /** @var EntityManagerInterface */
     private $entityManager;
 
     /**
-     * @param EntityManager $entityManager
+     * @param EntityManagerInterface $entityManager
      */
-    public function __construct(EntityManager $entityManager)
+    public function __construct(EntityManagerInterface $entityManager)
     {
         $this->entityManager = $entityManager;
     }
@@ -48,22 +48,22 @@ public function __construct(EntityManager $entityManager)
     public static function getSubscribedEvents()
     {
         return [
-            // Exceptions are one of the events defined by the Console. See the
+            // Errors are one of the events defined by the Console. See the
             // rest here: https://symfony.com/doc/current/components/console/events.html
-            ConsoleEvents::EXCEPTION => 'handleConsoleException',
+            ConsoleEvents::ERROR => 'handleConsoleError',
             // See: http://api.symfony.com/master/Symfony/Component/HttpKernel/KernelEvents.html
             KernelEvents::EXCEPTION => 'handleKernelException',
         ];
     }
 
     /**
-     * This method checks if there has been an exception in a command related to
+     * This method checks if there has been an error in a command related to
      * the database and then, it checks if the 'sqlite3' PHP extension is enabled
      * or not to display a better error message.
      *
-     * @param ConsoleExceptionEvent $event
+     * @param ConsoleErrorEvent $event
      */
-    public function handleConsoleException(ConsoleExceptionEvent $event)
+    public function handleConsoleError(ConsoleErrorEvent $event)
     {
         $commandNames = ['doctrine:fixtures:load', 'doctrine:database:create', 'doctrine:schema:create', 'doctrine:database:drop'];