diff --git a/src/foundation/pEp/jniadapter/AbstractEngine.java b/src/foundation/pEp/jniadapter/AbstractEngine.java
index f492ccb..323461a 100644
--- a/src/foundation/pEp/jniadapter/AbstractEngine.java
+++ b/src/foundation/pEp/jniadapter/AbstractEngine.java
@@ -175,7 +175,8 @@ abstract class AbstractEngine extends UniquelyIdentifiable implements AutoClosea
 
     public int notifyHandshakeCallFromC(_Identity _myself, _Identity _partner, SyncHandshakeSignal _signal) {
         Identity myself = new Identity(_myself);
-        Identity partner = new Identity(_partner);
+        Identity partner = (_partner != null) ? new Identity(_partner) : null;
+
         System.out.println("pEpSync" +"notifyHandshakeCallFromC: " + notifyHandshakeCallback);
         if (notifyHandshakeCallback != null) {
             notifyHandshakeCallback.notifyHandshake(myself, partner, _signal);
diff --git a/src/foundation_pEp_jniadapter_AbstractEngine.cc b/src/foundation_pEp_jniadapter_AbstractEngine.cc
index 3db137c..93ee0b1 100644
--- a/src/foundation_pEp_jniadapter_AbstractEngine.cc
+++ b/src/foundation_pEp_jniadapter_AbstractEngine.cc
@@ -164,6 +164,7 @@ PEP_STATUS notifyHandshake(pEp_identity *me, pEp_identity *partner, sync_handsha
 
     PEP_STATUS status = (PEP_STATUS) JNISync::env()->CallIntMethod(objj, notifyHandShakeMethodID, me_, partner_, signal_);
     if (JNISync::env()->ExceptionCheck()) {
+        JNISync::env()->Throw(JNISync::env()->ExceptionOccurred());
         JNISync::env()->ExceptionClear();
         return PEP_UNKNOWN_ERROR;
     }
diff --git a/src/pEp.yml2 b/src/pEp.yml2
index ca00095..8810026 100644
--- a/src/pEp.yml2
+++ b/src/pEp.yml2
@@ -68,6 +68,7 @@ namespace pEp {
         sync_notify_accepted_device_accepted > 8
         // sync_notify_overtaken > 9
         // sync_notify_forming_group > 10
+        sync_passphrase_required > 128
         sync_notify_sole > 254
         sync_notify_in_group > 255
     };