diff --git a/config/alfresco/public-rest-context.xml b/config/alfresco/public-rest-context.xml
index 2c06d0f957..bf3bc658ae 100644
--- a/config/alfresco/public-rest-context.xml
+++ b/config/alfresco/public-rest-context.xml
@@ -136,9 +136,7 @@
        <property name="exceptionMappings">
             <map>
                 <entry key="org.alfresco.rest.framework.core.exceptions.ApiException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_INTERNAL_SERVER_ERROR}" />
-                <entry key="java.lang.NullPointerException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_INTERNAL_SERVER_ERROR}" />
-                <entry key="java.lang.IndexOutOfBoundsException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_INTERNAL_SERVER_ERROR}" />
-                <entry key="java.lang.OutOfMemoryError" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_INTERNAL_SERVER_ERROR}" />
+                <entry key="java.lang.Throwable" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_INTERNAL_SERVER_ERROR}" />
                 <entry key="java.lang.IllegalArgumentException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_BAD_REQUEST}" />
                 <entry key="org.alfresco.service.cmr.repository.CyclicChildRelationshipException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_BAD_REQUEST}" />
                 <entry key="org.alfresco.rest.framework.core.exceptions.InvalidArgumentException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_BAD_REQUEST}" />
diff --git a/source/java/org/alfresco/rest/api/impl/NodesImpl.java b/source/java/org/alfresco/rest/api/impl/NodesImpl.java
index 13c697b8a8..ffb04e5c53 100644
--- a/source/java/org/alfresco/rest/api/impl/NodesImpl.java
+++ b/source/java/org/alfresco/rest/api/impl/NodesImpl.java
@@ -2937,25 +2937,16 @@ public class NodesImpl implements Nodes
             // Do not clean formData temp files to allow for retries.
             // Temp files will be deleted later when GC call DiskFileItem#finalize() method or by temp file cleaner.
         }
-        catch (ApiException apiEx)
-        {
-            // As this is an public API fwk exception, there is no need to convert it, so just throw it.
-            throw apiEx;
-        }
         catch (AccessDeniedException ade)
         {
             throw new PermissionDeniedException(ade.getMessage());
         }
-        catch (Exception ex)
-        {
-            /*
-             * NOTE: Do not clean formData temp files to allow for retries. It's
-             * possible for a temp file to remain if max retry attempts are
-             * made, but this is rare, so leave to usual temp file cleanup.
-             */
 
-            throw new ApiException("Unexpected error occurred during upload of new content.", ex);
-        }
+        /*
+         * NOTE: Do not clean formData temp files to allow for retries. It's
+         * possible for a temp file to remain if max retry attempts are
+         * made, but this is rare, so leave to usual temp file cleanup.
+         */
     }
 
     private NodeRef createNewFile(NodeRef parentNodeRef, String fileName, QName nodeType, Content content, Map<QName, Serializable> props, QName assocTypeQName, Parameters params,
diff --git a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
index 40f8964d4e..b8f041293f 100644
--- a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
+++ b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
@@ -1389,6 +1389,14 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
                     .setRelativePath("userTwoFolder1/userTwoFolder2")
                     .build();
         post(getNodeChildrenUrl(folderA_id), reqBody.getBody(), null, reqBody.getContentType(), 403);
+
+        // -ve test: integrity error
+        setRequestContext(user1);
+        reqBody = MultiPartBuilder.create()
+                .setFileData(new FileData("invalid:name", file))
+                .build();
+        // 422 -> invalid name (includes a ':' in this example)
+        post(getNodeChildrenUrl(coolFolder.getId()), reqBody.getBody(), null, reqBody.getContentType(), 422);
     }
 
     /**