diff --git a/lib/Alchemy/Phrasea/Controller/Root/Login.php b/lib/Alchemy/Phrasea/Controller/Root/Login.php
index 74fb29db41..77a325203d 100644
--- a/lib/Alchemy/Phrasea/Controller/Root/Login.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/Login.php
@@ -728,6 +728,9 @@ class Login implements ControllerProviderInterface
             case 'session' :
                 $warning = _('Error while authentication, please retry or contact an admin if problem persists');
                 break;
+            case 'unexpected' :
+                $warning = _('An unexpected error occured during authentication process, please contact an admin');
+                break;
         }
 
         if (ctype_digit($request->query->get('usr'))) {
@@ -984,7 +987,7 @@ class Login implements ControllerProviderInterface
 
                 return $app->redirect($url);
             } catch (\Exception $e) {
-                return $app->redirect("/login/?redirect=" . $request->request->get('redirect') . "&error=" . _('An error occured'));
+                return $app->redirect("/login/?redirect=" . $request->request->get('redirect') . "&error=unexpected");
             }
         } else {
             return $app->redirect("/login/");
diff --git a/tests/PhraseanetPHPUnitAbstract.class.inc b/tests/PhraseanetPHPUnitAbstract.class.inc
index ce6d699f92..c1cb600de5 100644
--- a/tests/PhraseanetPHPUnitAbstract.class.inc
+++ b/tests/PhraseanetPHPUnitAbstract.class.inc
@@ -7,7 +7,6 @@ use Alchemy\Phrasea\Border\File;
 use Doctrine\Common\DataFixtures\Loader;
 use Silex\WebTestCase;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\Client;
 use Symfony\Component\DomCrawler\Crawler;