diff --git a/src/Form/JobAbortForm.php b/src/Form/JobAbortForm.php
index 3b556a4..85ac012 100644
--- a/src/Form/JobAbortForm.php
+++ b/src/Form/JobAbortForm.php
@@ -58,7 +58,7 @@ class JobAbortForm extends ContentEntityConfirmFormBase {
     else {
       $entity->addMessage('The user ordered aborting the Job through the UI.');
     }
-    tmgmt_write_request_messages($entity);
+    tmgmt_write_request_messages_job($entity);
     $form_state->setRedirectUrl($this->entity->toUrl());
   }
 
diff --git a/src/Form/JobItemAbortForm.php b/src/Form/JobItemAbortForm.php
index 7b3db1a..00bab35 100644
--- a/src/Form/JobItemAbortForm.php
+++ b/src/Form/JobItemAbortForm.php
@@ -40,17 +40,7 @@ class JobItemAbortForm extends ContentEntityConfirmFormBase {
     $entity = $this->entity;
     try {
       if (!$entity->abortTranslation()) {
-        foreach ($entity->getMessagesSince() as $message) {
-          /** @var \Drupal\tmgmt\MessageInterface $message */
-          if ($message->getType() == 'debug') {
-            continue;
-          }
-          if ($text = $message->getMessage()) {
-            // We want to persist also the type therefore we will set the
-            // messages directly and not return them.
-            drupal_set_message($text, $message->getType());
-          }
-        }
+        tmgmt_write_request_messages_job_item($entity);
       }
     }
     catch(TMGMTException $e) {
diff --git a/src/Form/JobItemForm.php b/src/Form/JobItemForm.php
index 976741f..850d61c 100644
--- a/src/Form/JobItemForm.php
+++ b/src/Form/JobItemForm.php
@@ -558,7 +558,7 @@ class JobItemForm extends TmgmtFormBase {
   function ajaxReviewForm(array $form, FormStateInterface $form_state) {
     $key = array_slice($form_state->getTriggeringElement()['#array_parents'], 0, 2);
     $render_data = NestedArray::getValue($form, $key);
-    tmgmt_write_request_messages($form_state->getFormObject()->getEntity()->getJob());
+    tmgmt_write_request_messages_job_item($form_state->getFormObject()->getEntity());
     return $render_data;
   }
 
diff --git a/tmgmt.module b/tmgmt.module
index 0ed7917..4cdb1fa 100644
--- a/tmgmt.module
+++ b/tmgmt.module
@@ -687,7 +687,7 @@ function tmgmt_job_needs_checkout_form(JobInterface $job) {
 function tmgmt_job_request_translation(JobInterface $job) {
   // Process the translation request.
   $job->requestTranslation();
-  return tmgmt_write_request_messages($job);
+  return tmgmt_write_request_messages_job($job);
 }
 
 /**
@@ -699,7 +699,7 @@ function tmgmt_job_request_translation(JobInterface $job) {
  * @return bool
  *    FALSE if there are message with severity error, TRUE otherwise.
  */
-function tmgmt_write_request_messages(JobInterface $job) {
+function tmgmt_write_request_messages_job(JobInterface $job) {
   $errors = FALSE;
   foreach ($job->getMessagesSince() as $message) {
     // Ignore debug messages.
@@ -717,6 +717,31 @@ function tmgmt_write_request_messages(JobInterface $job) {
 }
 
 /**
+ * Print all messages that occurred since our request to the screen.
+ *
+ * @param \Drupal\tmgmt\JobItemInterface $job_item
+ *    The translation job for which the message should be written.
+ *
+ * @return bool
+ *    FALSE if there are message with severity error, TRUE otherwise.
+ */
+function tmgmt_write_request_messages_job_item(JobItemInterface $job_item) {
+  $errors = FALSE;
+  foreach ($job_item->getJob()->getMessagesSince() as $message) {
+    if ($message->getType() == 'debug') {
+      continue;
+    }
+    if ($message->getType() == 'error') {
+      $errors = TRUE;
+    }
+    if ($text = $message->getMessage()) {
+      drupal_set_message($text, $message->getType());
+    }
+  }
+  return !$errors;
+}
+
+/**
  * Helper function to output ajaxid.
  *
  * @param string $parent_key
@@ -813,7 +838,7 @@ function tmgmt_translation_review_form_update_state(array $form, FormStateInterf
     }
   }
   $job_item->save();
-  tmgmt_write_request_messages($job_item->getJob());
+  tmgmt_write_request_messages_job_item($job_item);
 }
 
 /**
diff --git a/translators/tmgmt_file/tmgmt_file.module b/translators/tmgmt_file/tmgmt_file.module
index fdf5ffb..b3d4b4d 100644
--- a/translators/tmgmt_file/tmgmt_file.module
+++ b/translators/tmgmt_file/tmgmt_file.module
@@ -56,15 +56,7 @@ function tmgmt_file_import_form_submit(array $form, FormStateInterface $form_sta
       }
     }
   }
-  foreach ($job->getMessagesSince() as $message) {
-    // Ignore debug messages.
-    if ($message->getType() == 'debug') {
-      continue;
-    }
-    if ($text = $message->getMessage()) {
-      drupal_set_message($text, $message->getType());
-    }
-  }
+  tmgmt_write_request_messages_job($job);
 }
 
 /**