diff --git a/swagger_server/controllers/extract_controller.py b/swagger_server/controllers/extract_controller.py
index 51cb6c0..5756986 100644
--- a/swagger_server/controllers/extract_controller.py
+++ b/swagger_server/controllers/extract_controller.py
@@ -20,6 +20,8 @@ ATEapi_endpoint = "http://ate-api:5000/predict"
 
 def do_izlusci(conllus, prepovedane_besede):
     tmp_file_path = ""
+    if prepovedane_besede is None:
+        prepovedane_besede = []
     try:
         big_conllu = cl_utils.multipla_conllus_to_one_from_conllus_arr(conllus)
         tmp_file_path = create_random_file_in_tmp_folder(big_conllu, ".conllu")
diff --git a/swagger_server/controllers/jobs_controller.py b/swagger_server/controllers/jobs_controller.py
index 1b57f84..65759b5 100644
--- a/swagger_server/controllers/jobs_controller.py
+++ b/swagger_server/controllers/jobs_controller.py
@@ -448,6 +448,8 @@ def execute_ateapi_job(job: Job, sem: threading.Semaphore):
         _res = do_izlusci(info['conllus'], info['prepovedane_besede'])
         if type(_res) is tuple:
             ret_json = _res[0]
+            if _res[1] != 200:
+                ret_json = f'ERROR - {ret_json}'
         else:
             try:
                 if type(_res.response) is dict: