Revised exception handling and adjustments suggested by Markus

12 jobs for new-edit-api in 27 minutes and 7 seconds (queued for 4 seconds)