diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialTypesOperationExecutor.java
index 87946966e32a15f46d9b77fbc2cca8fa6a432513..a09e6037c4755f76ed324b7f472fa387017d9a9d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialTypesOperationExecutor.java
@@ -19,7 +19,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.create.PropertyAssignme
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyTypeId;
 import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.ObjectNotFoundException;
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property.IMapPropertyTypeByIdExecutor;
-import ch.systemsx.cisd.openbis.generic.client.web.client.exception.UserFailureException;
+import ch.systemsx.cisd.common.exceptions.UserFailureException;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
 import ch.systemsx.cisd.openbis.generic.shared.dto.PropertyTypePE;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +48,8 @@ public class CreateMaterialTypesOperationExecutor
 {
 
     private static final List<DataTypeCode> INVALID_TYPES =
-            Arrays.asList(DataTypeCode.ARRAY_INTEGER, DataTypeCode.ARRAY_STRING, DataTypeCode.ARRAY_REAL,
+            Arrays.asList(DataTypeCode.ARRAY_INTEGER, DataTypeCode.ARRAY_STRING,
+                    DataTypeCode.ARRAY_REAL,
                     DataTypeCode.ARRAY_TIMESTAMP, DataTypeCode.JSON);
 
     @Autowired
@@ -82,7 +83,7 @@ public class CreateMaterialTypesOperationExecutor
     {
         for (MaterialTypeCreation materialTypeCreation : materialTypeCreations)
         {
-            if(materialTypeCreation.getPropertyAssignments() != null)
+            if (materialTypeCreation.getPropertyAssignments() != null)
             {
                 for (PropertyAssignmentCreation propertyAssignmentCreation : materialTypeCreation.getPropertyAssignments())
                 {
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypesOperationExecutor.java
index 064cd81ab01b1a116f470575b021cba62bb4f9ab..de0dbb2a168bafcd3a2a12af0328ed16994d8c1e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypesOperationExecutor.java
@@ -19,7 +19,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.create.PropertyAssignme
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyTypeId;
 import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.ObjectNotFoundException;
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property.IMapPropertyTypeByIdExecutor;
-import ch.systemsx.cisd.openbis.generic.client.web.client.exception.UserFailureException;
+import ch.systemsx.cisd.common.exceptions.UserFailureException;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
 import ch.systemsx.cisd.openbis.generic.shared.dto.PropertyTypePE;
 import org.springframework.beans.factory.annotation.Autowired;