diff --git a/src/Controller/PageController.php b/src/Controller/PageController.php
index 6c7e501..bb7c7ed 100644
--- a/src/Controller/PageController.php
+++ b/src/Controller/PageController.php
@@ -188,15 +188,21 @@ class PageController extends AbstractController
                         continue;
                     }
 
-                    if (empty($torrentService->getTorrentInfoNameByFilepath($file->getPathName())))
+                    //// Validate torrent format
+                    try
                     {
-                        $form['torrent']['error'][] = $translator->trans('Could not parse torrent file');
+                        \Rhilip\Bencode\TorrentFile::load(
+                            $file->getPathName()
+                        );
+                    }
 
-                        continue;
+                    catch (ParseException $e)
+                    {
+                        $form['torrents']['error'][] = $translator->trans('Could not parse torrent file');
                     }
 
                     //// Content
-                    $torrent = $torrentService->submit(
+                    $torrent = $torrentService->add(
                         $file->getPathName(),
                         $user->getId(),
                         time(),