diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
index 5acf4a742..9bc268f95 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
@@ -491,13 +491,13 @@ class PdoAddressBook
 			$aUrl = array();
 		}
 
-		$aUrl['scheme'] = isset($aUrl['scheme']) ? $aUrl['scheme'] : 'http';
-		$aUrl['host'] = isset($aUrl['host']) ? $aUrl['host'] : 'localhost';
-		$aUrl['port'] = isset($aUrl['port']) ? $aUrl['port'] : 80;
+		$aUrl['scheme'] = $aUrl['scheme'] ?? 'http';
+		$aUrl['host'] = $aUrl['host'] ?? 'localhost';
+		$aUrl['port'] = $aUrl['port'] ?? 0;
 		$aUrl['path'] = isset($aUrl['path']) ? \rtrim($aUrl['path'], '\\/').'/' : '/';
 
 		$aSettings = array(
-			'baseUri' => $aUrl['scheme'].'://'.$aUrl['host'].('80' === (string) $aUrl['port'] ? '' : ':'.$aUrl['port']),
+			'baseUri' => $aUrl['scheme'].'://'.$aUrl['host'].($aUrl['port'] ? ':'.$aUrl['port'] : ''),
 			'userName' => $sUser,
 			'password' => $sPassword
 		);
diff --git a/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Client.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Client.php
index 80d62e85e..36683400f 100644
--- a/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Client.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Client.php
@@ -418,7 +418,7 @@ class Client {
         );
 
         if ($curlErrNo) {
-            throw new Exception('[CURL] Error while making request: ' . $curlError . ' (error code: ' . $curlErrNo . ')');
+            throw new Exception('[CURL] Error while making request: ' . $curlError . ' (error code: ' . $curlErrNo . ', uri: ' . $url . ')');
         }
 
         if ($response['statusCode']>=400) {