diff --git a/src/Wallabag/CoreBundle/Command/ExportCommand.php b/src/Wallabag/CoreBundle/Command/ExportCommand.php
index 0cf5de488..e3d3b3995 100644
--- a/src/Wallabag/CoreBundle/Command/ExportCommand.php
+++ b/src/Wallabag/CoreBundle/Command/ExportCommand.php
@@ -7,7 +7,6 @@ use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\StreamOutput;
 
 class ExportCommand extends ContainerAwareCommand
 {
@@ -33,11 +32,13 @@ class ExportCommand extends ContainerAwareCommand
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         try {
-            $user = $this->getUser($input->getArgument('username'));
+            $user = $this->getDoctrine()->getRepository('WallabagUserBundle:User')->findOneByUserName($input->getArgument('username'));
         } catch (NoResultException $e) {
             $output->writeln(sprintf('<error>User "%s" not found.</error>', $input->getArgument('username')));
+
             return 1;
         }
+
         $entries = $this->getDoctrine()
             ->getRepository('WallabagCoreBundle:Entry')
             ->getBuilderForAllByUser($user->getId())
@@ -47,9 +48,11 @@ class ExportCommand extends ContainerAwareCommand
         $output->write(sprintf('Exporting %d entrie(s) for user « <comment>%s</comment> »... ', count($entries), $user->getUserName()));
 
         $filePath = $input->getArgument('filepath');
+
         if (!$filePath) {
-            $filePath = $this->getContainer()->getParameter('kernel.root_dir') . '/../' . sprintf('%s-export', $user->getUsername());
+            $filePath = $this->getContainer()->getParameter('kernel.root_dir').'/../'.sprintf('%s-export.json', $user->getUsername());
         }
+
         try {
             $data = $this->getContainer()->get('wallabag_core.helper.entries_export')
                 ->setEntries($entries)
@@ -58,21 +61,13 @@ class ExportCommand extends ContainerAwareCommand
             file_put_contents($filePath, $data);
         } catch (\InvalidArgumentException $e) {
             $output->writeln(sprintf('<error>Error: "%s"</error>', $e->getMessage()));
+
+            return 1;
         }
 
         $output->writeln('<info>Done.</info>');
-    }
 
-    /**
-     * Fetches a user from its username.
-     *
-     * @param string $username
-     *
-     * @return \Wallabag\UserBundle\Entity\User
-     */
-    private function getUser($username)
-    {
-        return $this->getDoctrine()->getRepository('WallabagUserBundle:User')->findOneByUserName($username);
+        return 0;
     }
 
     private function getDoctrine()
diff --git a/tests/Wallabag/CoreBundle/Command/ExportCommandTest.php b/tests/Wallabag/CoreBundle/Command/ExportCommandTest.php
index 4c66e051c..6798c5d71 100644
--- a/tests/Wallabag/CoreBundle/Command/ExportCommandTest.php
+++ b/tests/Wallabag/CoreBundle/Command/ExportCommandTest.php
@@ -56,6 +56,7 @@ class ExportCommandTest extends WallabagCoreTestCase
         ]);
 
         $this->assertContains('Exporting 6 entrie(s) for user « admin »... Done', $tester->getDisplay());
+        $this->assertFileExists('admin-export.json');
     }
 
     public function testExportCommandWithSpecialPath()