diff --git a/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java
index 2995c0c5f47..c67a0293847 100644
--- a/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java
@@ -283,7 +283,7 @@ public Boolean sendNotificationEmail(UserNotification notification, String comme
            if (objectOfNotification != null){
                String messageText = getMessageTextBasedOnNotification(notification, objectOfNotification, comment, requestor);
                String subjectText = MailUtil.getSubjectTextBasedOnNotification(notification, objectOfNotification);
-               if (!(messageText.isEmpty() || subjectText.isEmpty())){
+               if (!(StringUtils.isEmpty(messageText) || StringUtils.isEmpty(subjectText))){
                    retval = sendSystemEmail(emailAddress, subjectText, messageText, isHtmlContent);
                } else {
                    logger.warning("Skipping " + notification.getType() +  " notification, because couldn't get valid message");
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 2b74e24ea29..02bc19f86cf 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -843,7 +843,8 @@ notification.email.datasetWasMentioned=Hello {0},<br><br> The {1} has just been
 notification.email.datasetWasMentioned.subject={0}: A Dataset Relationship has been reported!
 notification.email.globus.uploadCompleted.subject={0}: Files uploaded successfully via Globus and verified
 notification.email.globus.downloadCompleted.subject={0}: Files downloaded successfully via Globus
-notification.email.globus.uploadCompletedWithErrors.subject={0}:  Uploaded files via Globus with errors
+notification.email.globus.downloadCompletedWithErrors.subject={0}: Globus download task completed, errors encountered
+notification.email.globus.uploadCompletedWithErrors.subject={0}: Globus upload task completed with errors
 notification.email.globus.uploadFailedRemotely.subject={0}:  Failed to upload files via Globus
 notification.email.globus.uploadFailedLocally.subject={0}:  Failed to add files uploaded via Globus to dataset
 # dataverse.xhtml