diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index 9b872f3556..e901c464d7 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -120,6 +120,8 @@ class File_redirection extends Managed_DataObject
                 // no content it'll be cheap. :)
                 $request = self::_commonHttp($short_url, $redirs);
                 $response = $request->send();
+            } elseif (400 == $response->getStatus()) {
+                throw new Exception('Got error 400 on HEAD request, will not go further.');
             }
         } catch (Exception $e) {
             // Invalid URL or failure to reach server
@@ -418,4 +420,4 @@ class File_redirection extends Managed_DataObject
 
         return $this->file;
     }
-}
\ No newline at end of file
+}