diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py
index 98cebab..f55d4bb 100644
--- a/mastodon/Mastodon.py
+++ b/mastodon/Mastodon.py
@@ -2245,6 +2245,8 @@ class Mastodon:
                         # on any 404
                 elif response_object.status_code == 401:
                     ex_type = MastodonUnauthorizedError
+                elif response_object.status_code == 502:
+                    ex_type = MastodonServerError
                 else:
                     ex_type = MastodonAPIError
 
@@ -2539,6 +2541,10 @@ class MastodonAPIError(MastodonError):
     """Raised when the mastodon API generates a response that cannot be handled"""
     pass
 
+class MastodonServerError(MastodonError):
+    """Raised if the Server is malconfigured, e.g. returns a 502 error code"""
+    pass
+
 class MastodonNotFoundError(MastodonAPIError):
     """Raised when the mastodon API returns a 404 Not Found error"""
     pass