diff --git a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookAddContact.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookAddContact.php
index 4e4f7e4..328599e 100644
--- a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookAddContact.php
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookAddContact.php
@@ -32,14 +32,7 @@
                 throw new MissingRpcArgumentException('peer');
             }
 
-            try
-            {
-                $address = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
-            }
-            catch(InvalidArgumentException $e)
-            {
-                throw new InvalidRpcArgumentException('peer', $e);
-            }
+            $peerAddress = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
 
             if($rpcRequest->containsParameter('relationship') && $rpcRequest->getParameter('relationship') !== null)
             {
@@ -57,22 +50,22 @@
             try
             {
                 $peer = $request->getPeer();
-                if($peer->getAddress() == $address)
+                if($peer->getAddress() == $peerAddress)
                 {
                     return $rpcRequest->produceError(StandardError::FORBIDDEN, 'Cannot add self as contact');
                 }
 
                 // Resolve the peer, this would throw a StandardException if something goes wrong
-                Socialbox::resolvePeer($address);
+                Socialbox::resolvePeer($peerAddress);
 
                 // Check if the contact already exists
-                if(ContactManager::isContact($peer, $address))
+                if(ContactManager::isContact($peer, $peerAddress))
                 {
                     return $rpcRequest->produceResponse(false);
                 }
 
                 // Create the contact
-                ContactManager::createContact($peer, $address, $relationship);
+                ContactManager::createContact($peer, $peerAddress, $relationship);
             }
             catch (DatabaseOperationException $e)
             {
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookContactExists.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookContactExists.php
index 9758ce2..eb1a409 100644
--- a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookContactExists.php
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookContactExists.php
@@ -29,19 +29,12 @@
                 throw new MissingRpcArgumentException('peer');
             }
 
-            try
-            {
-                $address = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
-            }
-            catch(InvalidArgumentException $e)
-            {
-                throw new InvalidRpcArgumentException('peer', $e);
-            }
+            $peerAddress = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
 
             try
             {
                 $peer = $request->getPeer();
-                return $rpcRequest->produceResponse(ContactManager::isContact($peer, $address));
+                return $rpcRequest->produceResponse(ContactManager::isContact($peer, $peerAddress));
             }
             catch (DatabaseOperationException $e)
             {
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookDeleteContact.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookDeleteContact.php
index b891b92..6266fe7 100644
--- a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookDeleteContact.php
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookDeleteContact.php
@@ -30,26 +30,19 @@
                 throw new MissingRpcArgumentException('peer');
             }
 
-            try
-            {
-                $address = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
-            }
-            catch(InvalidArgumentException $e)
-            {
-                throw new InvalidRpcArgumentException('peer', $e);
-            }
+            $peerAddress = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
 
             try
             {
                 // Check if the contact already exists
                 $peer = $request->getPeer();
-                if(!ContactManager::isContact($peer, $address))
+                if(!ContactManager::isContact($peer, $peerAddress))
                 {
                     return $rpcRequest->produceResponse(false);
                 }
 
                 // Create the contact
-                ContactManager::deleteContact($peer, $address);
+                ContactManager::deleteContact($peer, $peerAddress);
             }
             catch (DatabaseOperationException $e)
             {
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookGetContact.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookGetContact.php
index d73c9cd..ec0b2e5 100644
--- a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookGetContact.php
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookGetContact.php
@@ -29,16 +29,16 @@
                 throw new MissingRpcArgumentException('peer');
             }
 
-            $address = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
+            $peerAddress = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
 
             try
             {
-                if(!ContactManager::isContact($request->getPeer(), $address))
+                if(!ContactManager::isContact($request->getPeer(), $peerAddress))
                 {
                     return $rpcRequest->produceResponse();
                 }
 
-                return $rpcRequest->produceResponse(ContactManager::getStandardContact($request->getPeer(), $address));
+                return $rpcRequest->produceResponse(ContactManager::getStandardContact($request->getPeer(), $peerAddress));
             }
             catch(DatabaseOperationException $e)
             {
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookRevokeSignature.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookRevokeSignature.php
index 8e0426e..8252108 100644
--- a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookRevokeSignature.php
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookRevokeSignature.php
@@ -28,14 +28,7 @@
                 throw new MissingRpcArgumentException('peer');
             }
 
-            try
-            {
-                $address = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
-            }
-            catch(InvalidArgumentException $e)
-            {
-                throw new InvalidRpcArgumentException('peer', $e);
-            }
+            $peerAddress = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
 
             if(!$rpcRequest->containsParameter('signature_uuid'))
             {
@@ -45,7 +38,7 @@
             try
             {
                 // Check if the contact already exists
-                $contact = ContactManager::getContact($request->getPeer(), $address);
+                $contact = ContactManager::getContact($request->getPeer(), $peerAddress);
             }
             catch (DatabaseOperationException $e)
             {
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookTrustSignature.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookTrustSignature.php
index 4fc9da3..ed9c9ce 100644
--- a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookTrustSignature.php
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookTrustSignature.php
@@ -27,7 +27,7 @@
                 throw new MissingRpcArgumentException('peer');
             }
 
-            $address = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
+            $peerAddress = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
 
             if(!$rpcRequest->containsParameter('signature_uuid'))
             {
@@ -35,18 +35,18 @@
             }
 
             $signatureUuid = (string)$rpcRequest->getParameter('signature_uuid');
-            $signingKey = Socialbox::resolvePeerSignature($address, $signatureUuid);
+            $signingKey = Socialbox::resolvePeerSignature($peerAddress, $signatureUuid);
 
             try
             {
                 // Check if the contact already exists
                 $peer = $request->getPeer();
-                if(!ContactManager::isContact($peer, $address))
+                if(!ContactManager::isContact($peer, $peerAddress))
                 {
-                    ContactManager::createContact($peer, $address);
+                    ContactManager::createContact($peer, $peerAddress);
                 }
 
-                $contact = ContactManager::getContact($peer, $address);
+                $contact = ContactManager::getContact($peer, $peerAddress);
                 if(ContactManager::contactGetSigningKeysCount($contact) > Configuration::getPoliciesConfiguration()->getMaxContactSigningKeys())
                 {
                     return $rpcRequest->produceError(StandardError::FORBIDDEN, 'The contact has exceeded the maximum amount of trusted signatures');
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookUpdateRelationship.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookUpdateRelationship.php
index 45dce14..b0dd2c7 100644
--- a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookUpdateRelationship.php
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookUpdateRelationship.php
@@ -28,14 +28,7 @@
                 throw new MissingRpcArgumentException('peer');
             }
 
-            try
-            {
-                $receivingPeerAddress = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
-            }
-            catch(InvalidArgumentException $e)
-            {
-                throw new InvalidRpcArgumentException('peer', $e);
-            }
+            $peerAddress = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
 
             if(!$rpcRequest->containsParameter('relationship'))
             {
@@ -51,13 +44,13 @@
             {
                 // Check if the contact already exists
                 $requestingPeer = $request->getPeer();
-                if(!ContactManager::isContact($requestingPeer->getUuid(), $receivingPeerAddress))
+                if(!ContactManager::isContact($requestingPeer->getUuid(), $peerAddress))
                 {
                     return $rpcRequest->produceError(StandardError::FORBIDDEN, 'Contact does not exist');
                 }
 
                 // Create the contact
-                ContactManager::updateContactRelationship($requestingPeer->getUuid(), $receivingPeerAddress, $newRelationship);
+                ContactManager::updateContactRelationship($requestingPeer->getUuid(), $peerAddress, $newRelationship);
             }
             catch (DatabaseOperationException $e)
             {