If the file was invalid and Upload a CSV file was clicked, the job was created, then the send would fail when sending the file, trying to replace a placeholder that didn't exist.

This commit calls send_messages again if the files exist on the request.

app/main/views/send.py

@@ -197,21 +197,25 @@ def check_messages(service_id, upload_id):
             form=CsvUploadForm()
         )
     elif request.method == 'POST':
-        original_file_name = upload_data.get('original_file_name')
+        if request.files:
-        notification_count = upload_data.get('notification_count')
+            # The csv was invalid, validate the csv again
-        session.pop('upload_data')
+            return send_messages(service_id, template_id)
-        try:
+        else:
-            job_api_client.create_job(upload_id, service_id, template_id, original_file_name, notification_count)
+            original_file_name = upload_data.get('original_file_name')
-        except HTTPError as e:
+            notification_count = upload_data.get('notification_count')
-            if e.status_code == 404:
+            session.pop('upload_data')
-                abort(404)
+            try:
-            else:
+                job_api_client.create_job(upload_id, service_id, template_id, original_file_name, notification_count)
-                raise e
+            except HTTPError as e:
+                if e.status_code == 404:
+                    abort(404)
+                else:
+                    raise e
 
-        flash('We’ve started sending your messages', 'default_with_tick')
+            flash('We’ve started sending your messages', 'default_with_tick')
-        return redirect(
+            return redirect(
-            url_for('main.view_job', service_id=service_id, job_id=upload_id)
+                url_for('main.view_job', service_id=service_id, job_id=upload_id)
-        )
+            )
 
 
 def _get_filedata(file):