diff --git a/config/alfresco/public-rest-context.xml b/config/alfresco/public-rest-context.xml
index 02d055c54d..3ae0320bf9 100644
--- a/config/alfresco/public-rest-context.xml
+++ b/config/alfresco/public-rest-context.xml
@@ -147,6 +147,7 @@
                 <entry key="org.alfresco.service.cmr.repository.InvalidNodeRefException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_FOUND}" />
                 <entry key="org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_FOUND}" />
                 <entry key="org.alfresco.service.cmr.version.VersionDoesNotExistException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_FOUND}" />
+                <entry key="org.alfresco.repo.client.config.ClientAppNotFoundException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_FOUND}" />
                 <entry key="org.alfresco.rest.framework.core.exceptions.PermissionDeniedException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_FORBIDDEN}" />
                 <entry key="org.alfresco.repo.security.authority.UnknownAuthorityException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_FOUND}" />
                 <entry key="org.alfresco.repo.security.permissions.AccessDeniedException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_FORBIDDEN}" />
diff --git a/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java b/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java
index dfaf7f130a..2c36bc0432 100644
--- a/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java
+++ b/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -28,7 +28,6 @@ package org.alfresco.rest.api.impl;
 import org.alfresco.model.ContentModel;
 import org.alfresco.model.QuickShareModel;
 import org.alfresco.query.PagingRequest;
-import org.alfresco.repo.quickshare.QuickShareClientNotFoundException;
 import org.alfresco.repo.quickshare.QuickShareLinkExpiryActionException;
 import org.alfresco.repo.quickshare.QuickShareServiceImpl.QuickShareEmailRequest;
 import org.alfresco.repo.search.QueryParameterDefImpl;
@@ -385,10 +384,6 @@ public class QuickShareLinksImpl implements QuickShareLinks, RecognizedParamsExt
             logger.warn("Unable to find: " + sharedId + " [" + inre.getNodeRef() + "]");
             throw new EntityNotFoundException(sharedId);
         }
-        catch (QuickShareClientNotFoundException ex)
-        {
-            throw new InvalidArgumentException("Client is not registered [" + emailRequest.getClient() + "]");
-        }
     }
 
     private Parameters getParamsWithCreatedStatus()
diff --git a/source/test-java/org/alfresco/rest/api/tests/SharedLinkApiTest.java b/source/test-java/org/alfresco/rest/api/tests/SharedLinkApiTest.java
index 3b9d8d306f..a181abb710 100644
--- a/source/test-java/org/alfresco/rest/api/tests/SharedLinkApiTest.java
+++ b/source/test-java/org/alfresco/rest/api/tests/SharedLinkApiTest.java
@@ -636,7 +636,7 @@ public class SharedLinkApiTest extends AbstractBaseApiTest
 
         // Email request with minimal properties
         QuickShareLinkEmailRequest request = new QuickShareLinkEmailRequest();
-        request.setClient("sfs");
+        request.setClient("share");
         List<String> recipients = new ArrayList<>(2);
         recipients.add(user2 + "@acme.test");
         recipients.add(user2 + "@ping.test");
@@ -645,7 +645,7 @@ public class SharedLinkApiTest extends AbstractBaseApiTest
 
         // Email request with all the properties
         request = new QuickShareLinkEmailRequest();
-        request.setClient("sfs");
+        request.setClient("share");
         request.setMessage("My custom message!");
         request.setLocale(Locale.UK.toString());
         recipients = Collections.singletonList(user2 + "@acme.test");
@@ -661,14 +661,14 @@ public class SharedLinkApiTest extends AbstractBaseApiTest
         request.setClient("VeryCoolClient" + System.currentTimeMillis());
         List<String> user2Email = Collections.singletonList(user2 + "@acme.test");
         request.setRecipientEmails(user2Email);
-        post(getEmailSharedLinkUrl(sharedId), RestApiUtil.toJsonAsString(request), 400);
+        post(getEmailSharedLinkUrl(sharedId), RestApiUtil.toJsonAsString(request), 404);
 
         // client is mandatory
         request.setClient(null);
         post(getEmailSharedLinkUrl(sharedId), RestApiUtil.toJsonAsString(request), 400);
 
         // recipientEmails is mandatory
-        request.setClient("sfs");
+        request.setClient("share");
         request.setRecipientEmails(null);
         post(getEmailSharedLinkUrl(sharedId), RestApiUtil.toJsonAsString(request), 400);
 
@@ -679,7 +679,7 @@ public class SharedLinkApiTest extends AbstractBaseApiTest
         {
             quickShareLinks.setEnabled(false);
             request = new QuickShareLinkEmailRequest();
-            request.setClient("sfs");
+            request.setClient("share");
             request.setRecipientEmails(user2Email);
             post(getEmailSharedLinkUrl(sharedId), RestApiUtil.toJsonAsString(request), 501);
         }