diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/ServiceExceptionTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/ServiceExceptionTranslator.java
deleted file mode 100644
index edea7bab55322500e25176b128f75a7f32efcba2..0000000000000000000000000000000000000000
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/ServiceExceptionTranslator.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2008 ETH Zuerich, CISD
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.systemsx.cisd.openbis.generic.server.util;
-
-import org.springframework.aop.ThrowsAdvice;
-
-import ch.systemsx.cisd.common.utilities.ExceptionUtils;
-
-/**
- * A <code>ThrowsAdvice</code> implementation which remove proprietary/external libraries specific
- * exceptions from the one thrown on the server side.
- * <p>
- * This is used just before result returns to the client, on the service layer.
- * </p>
- * 
- * @author Christian Ribeaud
- */
-public final class ServiceExceptionTranslator implements ThrowsAdvice
-{
-
-    //
-    // ThrowsAdvice
-    //
-
-    public final void afterThrowing(final Exception exception) throws Exception
-    {
-        throw ExceptionUtils.createMasqueradingExceptionIfNeeded(exception);
-    }
-}
diff --git a/openbis/source/java/genericApplicationContext.xml b/openbis/source/java/genericApplicationContext.xml
index 90726c1f00831408fd582e7c38f7bd014373a313..c029a588122bc92f99280fc9631c760768be4958 100644
--- a/openbis/source/java/genericApplicationContext.xml
+++ b/openbis/source/java/genericApplicationContext.xml
@@ -108,7 +108,13 @@
     </bean>
 
     <bean id="exception-translator"
-        class="ch.systemsx.cisd.openbis.generic.server.util.ServiceExceptionTranslator" />
+        class="ch.systemsx.cisd.common.spring.ServiceExceptionTranslator">
+        <property name="packagesNotMasqueraded">
+            <list>
+                <value>ch.systemsx.cisd.openbis.generic.shared.dto</value>
+            </list>
+        </property>
+    </bean>
 
     <bean id="hibernate-transformer" class="ch.systemsx.cisd.openbis.generic.server.util.HibernateTransformer" />