diff --git a/src/org/pEp/jniadapter/Identity.java b/src/org/pEp/jniadapter/Identity.java
index d5e98cf..2201803 100644
--- a/src/org/pEp/jniadapter/Identity.java
+++ b/src/org/pEp/jniadapter/Identity.java
@@ -20,17 +20,12 @@ public class Identity {
     }
 
     public Identity(_Identity i) {
-        if (i.address != null)
-            address = AbstractEngine.toUTF16(i.address);
-        if (i.fpr != null)
-            fpr = AbstractEngine.toUTF16(i.fpr);
-        if (i.user_id != null)
-            user_id = AbstractEngine.toUTF16(i.user_id);
-        if (i.username != null)
-            username = AbstractEngine.toUTF16(i.username);
+        address = AbstractEngine.toUTF16(i.address);
+        fpr = AbstractEngine.toUTF16(i.fpr);
+        user_id = AbstractEngine.toUTF16(i.user_id);
+        username = AbstractEngine.toUTF16(i.username);
         comm_type = CommType.Management.tag.get(i.comm_type);
-        if (i.lang != null)
-            lang = AbstractEngine.toUTF16(i.lang);
+        lang = AbstractEngine.toUTF16(i.lang);
         me = i.me;
     }
 }
diff --git a/test/Testing.java b/test/Testing.java
index bd62d45..09f95f7 100644
--- a/test/Testing.java
+++ b/test/Testing.java
@@ -1,8 +1,4 @@
-import org.pEp.jniadapter.Engine;
-import org.pEp.jniadapter.pEpException;
-import org.pEp.jniadapter.Identity;
-import org.pEp.jniadapter.Message;
-import org.pEp.jniadapter.Blob;
+import org.pEp.jniadapter.*;
 import java.util.Vector;
 
 class Testing {