diff --git a/src/Util/Exception/ClientException.php b/src/Util/Exception/ClientException.php
index 31e8dde84b..cd318f16e2 100644
--- a/src/Util/Exception/ClientException.php
+++ b/src/Util/Exception/ClientException.php
@@ -17,10 +17,6 @@
 // along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
 // }}}
 
-namespace App\Util\Exception;
-
-use Exception;
-
 /**
  * Client exception. Indicates a client request contains some sort of
  * error. HTTP code 400
@@ -31,17 +27,22 @@ use Exception;
  * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet Inc.
  * @copyright 2009-2014 Free Software Foundation, Inc http://www.fsf.org
+ * @author    Alexei Sorokin <sor.alexei@meowr.ru>
  * @author    Hugo Sales <hugo@fc.up.pt>
- * @copyright 2018-2020 Free Software Foundation, Inc http://www.fsf.org
+ * @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
+
+namespace App\Util\Exception;
+
+use Exception;
+
 class ClientException extends Exception
 {
-    public function __construct(string $message = null, int $code = 400)
+    public function __construct(string $message = '', int $code = 500, Throwable $previous = null)
     {
-        parent::__construct($message, $code);
+        parent::__construct($message, $code, $previous);
     }
-
     public function __toString()
     {
         return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
diff --git a/src/Util/Exception/ServerException.php b/src/Util/Exception/ServerException.php
new file mode 100644
index 0000000000..25d798c982
--- /dev/null
+++ b/src/Util/Exception/ServerException.php
@@ -0,0 +1,54 @@
+<?php
+
+// {{{ License
+
+// This file is part of GNU social - https://www.gnu.org/software/social
+//
+// GNU social is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// GNU social is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
+
+// }}}
+
+/**
+ * Class for server exceptions
+ *
+ * Subclass of PHP Exception for server errors.
+ * The user typically can't fix these.
+ *
+ * @category  Exception
+ * @package   GNUsocial
+ *
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2008-2010 StatusNet, Inc.
+ * @author    Alexei Sorokin <sor.alexei@meowr.ru>
+ * @author    Hugo Sales <hugo@fc.up.pt>
+ * @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
+ * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
+ */
+
+namespace App\Util\Exception;
+
+use Exception;
+
+class ServerException extends Exception
+{
+    public function __construct(string $message = '', int $code = 500, Throwable $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
+
+    public function __toString()
+    {
+        return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
+    }
+}