diff --git a/eveonline/forms.py b/eveonline/forms.py
index 9572f478..a403daae 100644
--- a/eveonline/forms.py
+++ b/eveonline/forms.py
@@ -46,7 +46,4 @@ class UpdateKeyForm(forms.Form):
             raise forms.ValidationError(str(e))
         except evelink.api.APIError as e:
             logger.debug("Got error code %s while validating API %s" % (e.code, self.cleaned_data['api_id']))
-            if int(e.code) in [221, 222]:
-                raise forms.ValidationError("API key failed validation")
-            else:
-                raise forms.ValidationError("Failed to reach API servers")
+            raise forms.ValidationError('Error while checking API key (%s)' % e.code)
diff --git a/services/managers/eve_api_manager.py b/services/managers/eve_api_manager.py
index ea7c7f94..a61a3c6b 100644
--- a/services/managers/eve_api_manager.py
+++ b/services/managers/eve_api_manager.py
@@ -321,13 +321,11 @@ class EveApiManager:
             info = EveApiManager.get_api_info(api_id, api_key).result
             chars = EveApiManager.get_characters_from_api(api_id, api_key).result
         except evelink.api.APIError as e:
-            if int(e.code) in [221, 222]:
-                raise e
-            raise EveApiManager.ApiInvalidError(api_id)
+            if int(e.code) == 222:
+                raise EveApiManager.ApiInvalidError(api_id)
+            raise e
         except (requests.exceptions.RequestExeception, HTTPError, URLError) as e:
             raise EveApiManager.ApiServerUnreachableError(e)
-        except Exception:
-            raise EveApiManager.ApiInvalidError(api_id)
         auth, c = AuthServicesInfo.objects.get_or_create(user=user)
         states = [auth.state]
         from authentication.tasks import determine_membership_by_character  # circular import issue