2 files changed, 10 insertions, 2 deletions
diff --git a/eaaf_core_utils/checks/spotbugs-exclude.xml b/eaaf_core_utils/checks/spotbugs-exclude.xml
index 58ed1595..2b258e7c 100644
--- a/eaaf_core_utils/checks/spotbugs-exclude.xml
+++ b/eaaf_core_utils/checks/spotbugs-exclude.xml
@@ -30,10 +30,14 @@
       </OR>        
     </Match>
     <Match>
-      <Class name="at.gv.egiz.eaaf.core.impl.data.ExceptionContainer" />
+      <OR>
+      	<Class name="at.gv.egiz.eaaf.core.impl.data.ExceptionContainer" />
+      	<Class name="at.gv.egiz.eaaf.core.impl.data.ExceptionContainer$ExceptionContainerBuilder" />
+      </OR>
       <OR>
         <Bug pattern="JACKSON_UNSAFE_DESERIALIZATION" /> <!-- Use custom deserialization that implements some harding -->
-        <Bug pattern="EI_EXPOSE_REP" />        
+        <Bug pattern="EI_EXPOSE_REP" />
+        <Bug pattern="EI_EXPOSE_REP2" />          
       </OR>
     </Match>    
 </FindBugsFilter>
 \ No newline at end of file
diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/data/ExceptionContainer.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/data/ExceptionContainer.java
index cdb41147..586e819d 100644
--- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/data/ExceptionContainer.java
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/data/ExceptionContainer.java
@@ -34,6 +34,8 @@ import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.impl.json.EscapedJsonDeserializer;
 import at.gv.egiz.eaaf.core.impl.json.EscapedJsonSerializer;
 import at.gv.egiz.eaaf.core.impl.utils.EaafSerializationUtils;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -46,7 +48,9 @@ import lombok.Setter;
  */
 @Getter
 @Setter
+@Builder
 @NoArgsConstructor
+@AllArgsConstructor
 public class ExceptionContainer implements Serializable {
 
   private static final long serialVersionUID = 5355860753609684995L;