diff --git a/config/alfresco/public-rest-context.xml b/config/alfresco/public-rest-context.xml
index 6b329f99c1..34fada4c28 100644
--- a/config/alfresco/public-rest-context.xml
+++ b/config/alfresco/public-rest-context.xml
@@ -143,6 +143,7 @@
                 <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}" />
                 <entry key="org.alfresco.service.cmr.version.VersionServiceException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_BAD_REQUEST}" />
+                <entry key="org.alfresco.service.cmr.repository.datatype.TypeConversionException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_BAD_REQUEST}" />
                 <entry key="org.alfresco.rest.framework.core.exceptions.NotFoundException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_FOUND}" />
                 <entry key="org.alfresco.rest.framework.core.exceptions.EntityNotFoundException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_FOUND}" />
                 <entry key="org.alfresco.service.cmr.repository.InvalidNodeRefException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_FOUND}" />
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 86be6b21a7..6c6072c6b7 100644
--- a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
+++ b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
@@ -3058,6 +3058,22 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
         fUpdate.setProperties(props);
         put(URL_NODES, f2Id, toJsonAsStringNonNull(fUpdate), null, 400);
 
+        // -ve test - minor: error code if trying to update property with invalid format (REPO-1635)
+        props = new HashMap<>();
+        props.put("exif:dateTimeOriginal", "25-11-2016");
+        fUpdate = new Folder();
+        fUpdate.setProperties(props);
+        put(URL_NODES, f2Id, toJsonAsStringNonNull(fUpdate), null, 400);
+        
+        // +ve test - try again with valid formats (REPO-473, REPO-1635)
+        props = new HashMap<>();
+        props.put("exif:pixelYDimension", "123");
+        props.put("exif:dateTimeOriginal", "2016-11-21T16:26:19.037+0000");
+        fUpdate = new Folder();
+        fUpdate.setProperties(props);
+        put(URL_NODES, f2Id, toJsonAsStringNonNull(fUpdate), null, 200);
+        
+        
         // -ve test - non-admin cannot modify root (Company Home) folder
         props = new HashMap<>();
         props.put("cm:description", "my folder description");