diff --git a/ldvspec/lofardata/tasks.py b/ldvspec/lofardata/tasks.py
index 169b94b8095ea528172f48d2683cde2d47ecbfc6..462e05830a5ef36e248912cd10b276a5a55b51fd 100644
--- a/ldvspec/lofardata/tasks.py
+++ b/ldvspec/lofardata/tasks.py
@@ -156,7 +156,13 @@ def insert_task_into_atdb(workspecification_id: int):
         pk=workspecification_id
     )
     inputs: Dict[str, Any] = work_spec.inputs.copy()
-    entries: List[dict] = inputs.pop("surls")
+
+    try:
+        entries: List[dict] = inputs.pop("surls")
+    except IndexError:
+        logger.error("Work specification does not contain any surls. This should never happen")
+        raise RequestNotOk
+
 
     batches = split_entries_to_batches(entries, work_spec.batch_size)
 
@@ -189,6 +195,7 @@ def insert_task_into_atdb(workspecification_id: int):
             res = sess.post(url, json=payload, auth=TokenAuth(site.access_token))
 
             if not res.ok:
+                logger.error("Request not ok: {}".format(res.text))
                 raise RequestNotOk()
 
             # Store ATDB Task ID in related_tasks
@@ -202,7 +209,8 @@ def insert_task_into_atdb(workspecification_id: int):
         work_spec.submission_status = SUBMISSION_STATUS.DEFINING
         if work_spec.is_auto_submit:
             set_tasks_defined.delay(workspecification_id)
-    except (RequestException, RequestNotOk):
+    except (RequestException, RequestNotOk) as err:
+        logger.error(err)
         work_spec.submission_status = SUBMISSION_STATUS.ERROR
     finally:
         work_spec.save()