diff --git a/scripts/download_job_artifacts.py b/scripts/download_job_artifacts.py
index 149c09cdba26e99b4608700972f1cdeda9f24716..007ba5f5232e8e4d9df9f55d07e35b04b98397b4 100755
--- a/scripts/download_job_artifacts.py
+++ b/scripts/download_job_artifacts.py
@@ -137,29 +137,34 @@ def main(args):
     logging.debug(options)
     gitlab = gl.Gitlab(options.gitlab_url, private_token=options.token)
 
-    if options.path is None:
-        if options.destination is None:
-            destination = tempfile.NamedTemporaryFile().name
+    try:
+        if options.path is None:
+            if options.destination is None:
+                destination = tempfile.NamedTemporaryFile().name
+            else:
+                destination = options.destination
+
+            print(destination)
+            filename = download_job_artifacts(
+                gitlab, destination, options.job, options.project, extract=True
+            )
+            print("Downloaded artifacts for job {} to {}".format(options.job, filename))
         else:
-            destination = options.destination
-
-        print(destination)
-        filename = download_job_artifacts(
-            gitlab, destination, options.job, options.project, extract=True
-        )
-        print("Downloaded artifacts for job {} to {}".format(options.job, filename))
-    else:
-        if options.destination is None:
-            destination = tempfile.TemporaryDirectory().name
-        else:
-            destination = options.destination
-
-        filename = download_job_artifact(
-            gitlab, destination, options.path, options.job, options.project
-        )
-        print(
-            "Downloaded {} for job {} to {}".format(options.path, options.job, filename)
-        )
+            if options.destination is None:
+                destination = tempfile.TemporaryDirectory().name
+            else:
+                destination = options.destination
+
+            filename = download_job_artifact(
+                gitlab, destination, options.path, options.job, options.project
+            )
+            print(
+                "Downloaded {} for job {} to {}".format(
+                    options.path, options.job, filename
+                )
+            )
+    except gl.exceptions.GitlabGetError as e:
+        exit("ERROR: %s" % e)
 
 
 if __name__ == "__main__":