diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Exceptions/ClientException.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Exceptions/ClientException.php
index 354460e17..7827bd261 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Exceptions/ClientException.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Exceptions/ClientException.php
@@ -23,7 +23,7 @@ class ClientException extends Exception
 		parent::__construct(\RainLoop\Notifications::GetNotificationsMessage($iCode, $oPrevious),
 			$iCode, $oPrevious);
 
-		$this->sAdditionalMessage = $sAdditionalMessage;
+		$this->sAdditionalMessage = $sAdditionalMessage ?: ($oPrevious ? $oPrevious->getMessage() : '');
 
 		$this->bLogoutOnException = $bLogoutOnException;
 	}