diff --git a/modules/salesforce_logger/src/EventSubscriber/SalesforceLoggerSubscriber.php b/modules/salesforce_logger/src/EventSubscriber/SalesforceLoggerSubscriber.php
index e8b23b985d9453e8d964f933e82e85b4843e437f..2cafe01991c32f55432060b8d7af6cb04766b42d 100644
--- a/modules/salesforce_logger/src/EventSubscriber/SalesforceLoggerSubscriber.php
+++ b/modules/salesforce_logger/src/EventSubscriber/SalesforceLoggerSubscriber.php
@@ -65,8 +65,9 @@ class SalesforceLoggerSubscriber implements EventSubscriberInterface {
     if ($exception) {
       $this->logger->log($event->getLevel(), self::EXCEPTION_MESSAGE_PLACEHOLDER, Error::decodeException($exception));
     }
-
-    $this->logger->log($event->getLevel(), $event->getMessage(), $event->getContext());
+    else {
+      $this->logger->log($event->getLevel(), $event->getMessage(), $event->getContext());
+    }
   }
 
 }
diff --git a/src/Event/SalesforceExceptionEvent.php b/src/Event/SalesforceExceptionEvent.php
index 7ce374418c1b0e464440d0d916692d10a404eeb3..f7e1f888ab5eb4db2d97a26cc34726d3f1cf87b5 100644
--- a/src/Event/SalesforceExceptionEvent.php
+++ b/src/Event/SalesforceExceptionEvent.php
@@ -72,7 +72,15 @@ abstract class SalesforceExceptionEvent extends SalesforceBaseEvent implements S
    * {@inheritdoc}
    */
   public function getMessage() {
-    return $this->message;
+    if ($this->message) {
+      return $this->message;
+    }
+    elseif ($this->exception && $this->exception->getMessage()) {
+      return $this->exception->getMessage();
+    }
+    else {
+      return 'Unknown Salesforce event.';
+    }
   }
 
   /**
diff --git a/src/Event/SalesforceExceptionEventInterface.php b/src/Event/SalesforceExceptionEventInterface.php
index 90110c2b5b93fc70f7b51688dce82a0d1570ac2e..3d1bedf93ba1744415ecc12fab27bd7d292d1478 100644
--- a/src/Event/SalesforceExceptionEventInterface.php
+++ b/src/Event/SalesforceExceptionEventInterface.php
@@ -28,9 +28,7 @@ interface SalesforceExceptionEventInterface {
    * Getter for message string.
    *
    * @return string
-   *   The formatted message for this event. (Note: to get the Exception
-   *   message, use ::getExceptionMessage()). If no message was given,
-   *   FormattableMarkup will be an empty string.
+   *   The message for this event, or a default message.
    */
   public function getMessage();