Be safer in checking for 403 errors

RIPE-NCC · Nov 23, 2018 · e312434 · e312434
1 parent c815fe5
commit e312434
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/ripe/atlas/tools/commands/measure/base.py b/ripe/atlas/tools/commands/measure/base.py
@@ -463,21 +463,21 @@ def _handle_api_error(response):
         if isinstance(response, dict) and "detail" in response:
             error_detail = response["detail"]
 
+            if response.get("error", {}).get("status") == 403:
+                message = (
+                    "There was a problem communicating with the RIPE Atlas "
+                    "infrastructure. \nStatus is 403 so you probably need an API "
+                    "key. Register and create API Keys at "
+                    "https://atlas.ripe.net/\n"
+                    "Create the new key with the permission Create a new user "
+                    "defined measurement and install using:\n\n"
+                    "   ripe-atlas configure --set authorisation.create=MY_API_KEY\n\n"
+                    "The message given was:\n\n  {}"
+                ).format(error_detail)
+
         message = (
             "There was a problem communicating with the RIPE Atlas "
             "infrastructure.  The message given was:\n\n  {}"
         ).format(error_detail)
 
-        if response["error"]["status"] == 403:
-            message = (
-                "There was a problem communicating with the RIPE Atlas "
-                "infrastructure. \nStatus is 403 so you probably need an API "
-                "key. Register and create API Keys at "
-                "https://atlas.ripe.net/\n"
-                "Create the new key with the permission Create a new user "
-                "defined measurement and install using:\n\n"
-                "   ripe-atlas configure --set authorisation.create=MY_API_KEY\n\n"
-                "The message given was:\n\n  {}"
-            ).format(error_detail)
-
         raise RipeAtlasToolsException(message)