diff --git a/Example/nrf-mesh/app/build.gradle b/Example/nrf-mesh/app/build.gradle
index a80b206cf..62a5e6cc7 100644
--- a/Example/nrf-mesh/app/build.gradle
+++ b/Example/nrf-mesh/app/build.gradle
@@ -30,8 +30,8 @@ android {
         applicationId "no.nordicsemi.android.nrfmeshprovisioner"
         minSdkVersion 18
         targetSdkVersion 29
-        versionCode 57
-        versionName "2.1.1"
+        versionCode 58
+        versionName "2.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/ble/BleMeshManager.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/ble/BleMeshManager.java
index 6481573e6..1e73082f9 100644
--- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/ble/BleMeshManager.java
+++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/ble/BleMeshManager.java
@@ -112,7 +112,7 @@ protected void initialize() {
 
             // This callback will be called each time a notification is received.
             final DataReceivedCallback onDataReceived = (device, data) ->
-                    mCallbacks.onDataReceived(device, getMtu(), data.getValue());
+                    mCallbacks.onDataReceived(device, getMaximumPacketSize(), data.getValue());
 
             // Set the notification callback and enable notification on Data In characteristic.
             final BluetoothGattCharacteristic characteristic = isProvisioningComplete ?
@@ -178,7 +178,7 @@ public void sendPdu(final byte[] pdu) {
 
         // This callback will be called each time the data were sent.
         final DataSentCallback callback = (device, data) ->
-                mCallbacks.onDataSent(device, getMtu(), data.getValue());
+                mCallbacks.onDataSent(device, getMaximumPacketSize(), data.getValue());
 
         // Write the right characteristic.
         final BluetoothGattCharacteristic characteristic = isProvisioningComplete ?
@@ -189,9 +189,8 @@ public void sendPdu(final byte[] pdu) {
                 .enqueue();
     }
 
-    @Override
-    public int getMtu() {
-        return super.getMtu();
+    public int getMaximumPacketSize() {
+        return super.getMtu() - 3;
     }
 
     public boolean isProvisioningComplete() {
@@ -209,4 +208,4 @@ private boolean hasWriteNoResponseProperty(@NonNull final BluetoothGattCharacter
     private boolean hasNotifyProperty(@NonNull final BluetoothGattCharacteristic characteristic) {
         return (characteristic.getProperties() & BluetoothGattCharacteristic.PROPERTY_NOTIFY) != 0;
     }
-}
\ No newline at end of file
+}
diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/viewmodels/NrfMeshRepository.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/viewmodels/NrfMeshRepository.java
index c018b25be..e3e9d984c 100644
--- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/viewmodels/NrfMeshRepository.java
+++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/viewmodels/NrfMeshRepository.java
@@ -637,7 +637,7 @@ public void onMeshPduCreated(final byte[] pdu) {
 
     @Override
     public int getMtu() {
-        return mBleMeshManager.getMtu();
+        return mBleMeshManager.getMaximumPacketSize();
     }
 
     @Override
diff --git a/android-nrf-mesh-library/meshprovisioner/build.gradle b/android-nrf-mesh-library/meshprovisioner/build.gradle
index 099549677..b0988127f 100644
--- a/android-nrf-mesh-library/meshprovisioner/build.gradle
+++ b/android-nrf-mesh-library/meshprovisioner/build.gradle
@@ -29,8 +29,8 @@ android {
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 29
-        versionCode 57
-        versionName "2.1.1"
+        versionCode 58
+        versionName "2.1.2"
 
         javaCompileOptions {
             annotationProcessorOptions {
diff --git a/android-nrf-mesh-library/meshprovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/MeshProvisioningHandler.java b/android-nrf-mesh-library/meshprovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/MeshProvisioningHandler.java
index f62344f79..a40c739d6 100644
--- a/android-nrf-mesh-library/meshprovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/MeshProvisioningHandler.java
+++ b/android-nrf-mesh-library/meshprovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/MeshProvisioningHandler.java
@@ -23,6 +23,7 @@
 package no.nordicsemi.android.meshprovisioner;
 
 import android.content.Context;
+import android.util.Log;
 
 import java.nio.ByteBuffer;
 import java.util.UUID;
@@ -50,7 +51,7 @@
 import no.nordicsemi.android.meshprovisioner.utils.StaticOOBType;
 
 class MeshProvisioningHandler implements InternalProvisioningCallbacks {
-
+    private static final String TAG = MeshProvisioningHandler.class.getSimpleName();
     static final int ATTENTION_TIMER = 5; //seconds
     private final InternalTransportCallbacks mInternalTransportCallbacks;
     private final Context mContext;
@@ -98,60 +99,65 @@ void setProvisioningCallbacks(MeshProvisioningStatusCallbacks provisioningCallba
 
     void parseProvisioningNotifications(final byte[] data) {
         final UnprovisionedMeshNode unprovisionedMeshNode = mUnprovisionedMeshNode;
-        switch (provisioningState.getState()) {
-            case PROVISIONING_INVITE:
-                break;
-            case PROVISIONING_CAPABILITIES:
-                if (validateMessage(data)) {
-                    if (!parseProvisioningCapabilitiesMessage(unprovisionedMeshNode, data)) {
+        try {
+            switch (provisioningState.getState()) {
+                case PROVISIONING_INVITE:
+                    break;
+                case PROVISIONING_CAPABILITIES:
+                    if (validateMessage(data)) {
+                        if (!parseProvisioningCapabilitiesMessage(unprovisionedMeshNode, data)) {
+                            parseProvisioningState(unprovisionedMeshNode, data);
+                        }
+                    } else {
                         parseProvisioningState(unprovisionedMeshNode, data);
                     }
-                } else {
-                    parseProvisioningState(unprovisionedMeshNode, data);
-                }
-                break;
-            case PROVISIONING_START:
-                break;
-            case PROVISIONING_PUBLIC_KEY:
-                if (validateMessage(data)) {
-                    parseProvisioneePublicKeyXY(unprovisionedMeshNode, data);
-                } else {
-                    parseProvisioningState(unprovisionedMeshNode, data);
-                }
-                break;
-            case PROVISIONING_INPUT_COMPLETE:
-                if (validateMessage(data)) {
-                    if (parseProvisioningInputCompleteState(data)) {
-                        sendProvisioningConfirmation(null);
+                    break;
+                case PROVISIONING_START:
+                    break;
+                case PROVISIONING_PUBLIC_KEY:
+                    if (validateMessage(data)) {
+                        parseProvisioneePublicKeyXY(unprovisionedMeshNode, data);
+                    } else {
+                        parseProvisioningState(unprovisionedMeshNode, data);
                     }
-                } else {
-                    parseProvisioningState(unprovisionedMeshNode, data);
-                }
-                break;
-            case PROVISIONING_CONFIRMATION:
-                if (validateMessage(data)) {
-                    if (parseProvisioneeConfirmation(data)) {
-                        sendRandomConfirmationPDU(unprovisionedMeshNode);
+                    break;
+                case PROVISIONING_INPUT_COMPLETE:
+                    if (validateMessage(data)) {
+                        if (parseProvisioningInputCompleteState(data)) {
+                            sendProvisioningConfirmation(null);
+                        }
+                    } else {
+                        parseProvisioningState(unprovisionedMeshNode, data);
                     }
-                } else {
-                    parseProvisioningState(unprovisionedMeshNode, data);
-                }
-                break;
-            case PROVISIONING_RANDOM:
-                if (validateMessage(data)) {
-                    if (parseProvisioneeRandom(data)) {
-                        sendProvisioningData(unprovisionedMeshNode);
+                    break;
+                case PROVISIONING_CONFIRMATION:
+                    if (validateMessage(data)) {
+                        if (parseProvisioneeConfirmation(data)) {
+                            sendRandomConfirmationPDU(unprovisionedMeshNode);
+                        }
+                    } else {
+                        parseProvisioningState(unprovisionedMeshNode, data);
+                    }
+                    break;
+                case PROVISIONING_RANDOM:
+                    if (validateMessage(data)) {
+                        if (parseProvisioneeRandom(data)) {
+                            sendProvisioningData(unprovisionedMeshNode);
+                        }
+                    } else {
+                        parseProvisioningState(unprovisionedMeshNode, data);
                     }
-                } else {
+                    break;
+                case PROVISIONING_DATA:
+                case PROVISIONING_COMPLETE:
+                case PROVISIONING_FAILED:
                     parseProvisioningState(unprovisionedMeshNode, data);
-                }
-                break;
-            case PROVISIONING_DATA:
-            case PROVISIONING_COMPLETE:
-            case PROVISIONING_FAILED:
-                parseProvisioningState(unprovisionedMeshNode, data);
-                break;
+                    break;
 
+            }
+        } catch (Exception ex) {
+            Log.e(TAG, "Exception in " + provisioningState.getState().name() + " : " + ex.getMessage());
+            parseProvisioningState(unprovisionedMeshNode, data);
         }
     }
 
@@ -180,18 +186,16 @@ void handleProvisioningWriteCallbacks() {
     }
 
     private void parseProvisioningState(final UnprovisionedMeshNode unprovisionedMeshNode, final byte[] data) {
+        isProvisioningPublicKeySent = false;
+        isProvisioneePublicKeyReceived = false;
         if (data[1] == ProvisioningState.State.PROVISIONING_COMPLETE.getState()) {
             provisioningState = new ProvisioningCompleteState(unprovisionedMeshNode);
-            isProvisioningPublicKeySent = false;
-            isProvisioneePublicKeyReceived = false;
             //Generate the network id and store it in the mesh node, this is needed to reconnect to the device at a later stage.
             final ProvisionedMeshNode provisionedMeshNode = new ProvisionedMeshNode(unprovisionedMeshNode);
             mInternalMeshManagerCallbacks.onNodeProvisioned(provisionedMeshNode);
             mStatusCallbacks.onProvisioningCompleted(provisionedMeshNode, ProvisioningState.States.PROVISIONING_COMPLETE, data);
         } else {
-            isProvisioningPublicKeySent = false;
-            isProvisioneePublicKeyReceived = false;
-            final ProvisioningFailedState provisioningFailedState = new ProvisioningFailedState(mContext, unprovisionedMeshNode);
+            final ProvisioningFailedState provisioningFailedState = new ProvisioningFailedState();
             provisioningState = provisioningFailedState;
             if (provisioningFailedState.parseData(data)) {
                 mStatusCallbacks.onProvisioningFailed(unprovisionedMeshNode, ProvisioningState.States.PROVISIONING_FAILED, data);
@@ -202,11 +206,11 @@ private void parseProvisioningState(final UnprovisionedMeshNode unprovisionedMes
     /**
      * Initializes a mesh node object to be provisioned
      *
-     * @param uuid               Device UUID of unprovisioned node
-     * @param networkKey         Network key
-     * @param flags              Flag containing the key refresh or the iv update operations
-     * @param ivIndex            32-bit value shared across the network
-     * @param globalTtl          Global ttl which is also the number of hops to be used for a message
+     * @param uuid       Device UUID of unprovisioned node
+     * @param networkKey Network key
+     * @param flags      Flag containing the key refresh or the iv update operations
+     * @param ivIndex    32-bit value shared across the network
+     * @param globalTtl  Global ttl which is also the number of hops to be used for a message
      * @return {@link MeshModel} to be provisioned
      */
     private UnprovisionedMeshNode initializeMeshNode(@NonNull final UUID uuid,
@@ -235,7 +239,8 @@ private UnprovisionedMeshNode initializeMeshNode(@NonNull final UUID uuid,
         return unprovisionedMeshNode;
     }
 
-    private boolean validateProvisioningDataInput(final NetworkKey networkKey, final Integer flags, final Integer ivIndex) {
+    private boolean validateProvisioningDataInput(final NetworkKey networkKey,
+                                                  final Integer flags, final Integer ivIndex) {
         String error;
 
         if (networkKey == null) {
@@ -268,12 +273,12 @@ private boolean validateProvisioningDataInput(final NetworkKey networkKey, final
      * This method must be invoked before calling {@link #startProvisioningNoOOB(UnprovisionedMeshNode)}
      * </p
      *
-     * @param uuid               Device UUID of unprovisioned node
-     * @param networkKey         Network key
-     * @param flags              Flag containing the key refresh or the iv update operations
-     * @param ivIndex            32-bit value shared across the network
-     * @param globalTtl          Global ttl which is also the number of hops to be used for a message
-     * @param attentionTimer     Attention timer
+     * @param uuid           Device UUID of unprovisioned node
+     * @param networkKey     Network key
+     * @param flags          Flag containing the key refresh or the iv update operations
+     * @param ivIndex        32-bit value shared across the network
+     * @param globalTtl      Global ttl which is also the number of hops to be used for a message
+     * @param attentionTimer Attention timer
      */
     void identify(@NonNull final UUID uuid,
                   @NonNull final NetworkKey networkKey,
@@ -296,7 +301,8 @@ void identify(@NonNull final UUID uuid,
      *
      * @param unprovisionedMeshNode {@link UnprovisionedMeshNode}
      */
-    void startProvisioningNoOOB(@NonNull final UnprovisionedMeshNode unprovisionedMeshNode) throws IllegalArgumentException {
+    void startProvisioningNoOOB(@NonNull final UnprovisionedMeshNode unprovisionedMeshNode) throws
+            IllegalArgumentException {
         sendProvisioningStart(unprovisionedMeshNode);
     }
 
@@ -308,7 +314,8 @@ void startProvisioningNoOOB(@NonNull final UnprovisionedMeshNode unprovisionedMe
      *
      * @param unprovisionedMeshNode {@link UnprovisionedMeshNode}
      */
-    void startProvisioningWithStaticOOB(@NonNull final UnprovisionedMeshNode unprovisionedMeshNode) throws IllegalArgumentException {
+    void startProvisioningWithStaticOOB(
+            @NonNull final UnprovisionedMeshNode unprovisionedMeshNode) throws IllegalArgumentException {
         sendProvisioningStartWithStaticOOB(unprovisionedMeshNode);
     }
 
@@ -321,7 +328,9 @@ void startProvisioningWithStaticOOB(@NonNull final UnprovisionedMeshNode unprovi
      * @param unprovisionedMeshNode {@link UnprovisionedMeshNode}
      * @param action                Selected {@link OutputOOBAction}
      */
-    void startProvisioningWithOutputOOB(@NonNull final UnprovisionedMeshNode unprovisionedMeshNode, @NonNull final OutputOOBAction action) throws IllegalArgumentException {
+    void startProvisioningWithOutputOOB(
+            @NonNull final UnprovisionedMeshNode unprovisionedMeshNode,
+            @NonNull final OutputOOBAction action) throws IllegalArgumentException {
         sendProvisioningStartWithOutputOOB(unprovisionedMeshNode, action);
     }
 
@@ -334,7 +343,9 @@ void startProvisioningWithOutputOOB(@NonNull final UnprovisionedMeshNode unprovi
      * @param unprovisionedMeshNode {@link UnprovisionedMeshNode}
      * @param action                Selected {@link InputOOBAction}
      */
-    void startProvisioningWithInputOOB(@NonNull final UnprovisionedMeshNode unprovisionedMeshNode, @NonNull final InputOOBAction action) throws IllegalArgumentException {
+    void startProvisioningWithInputOOB(
+            @NonNull final UnprovisionedMeshNode unprovisionedMeshNode,
+            @NonNull final InputOOBAction action) throws IllegalArgumentException {
         sendProvisioningStartWithInputOOB(unprovisionedMeshNode, action);
     }
 
@@ -352,7 +363,8 @@ private void sendProvisioningInvite(final UnprovisionedMeshNode unprovisionedMes
      * @param capabilities provisioning capabilities of the node
      * @return true if the message is valid
      */
-    private boolean parseProvisioningCapabilitiesMessage(final UnprovisionedMeshNode unprovisionedMeshNode, final byte[] capabilities) {
+    private boolean parseProvisioningCapabilitiesMessage(
+            final UnprovisionedMeshNode unprovisionedMeshNode, final byte[] capabilities) {
         final ProvisioningCapabilitiesState provisioningCapabilitiesState = new ProvisioningCapabilitiesState(unprovisionedMeshNode, mStatusCallbacks);
         provisioningState = provisioningCapabilitiesState;
         return provisioningCapabilitiesState.parseData(capabilities);
@@ -374,7 +386,8 @@ private void sendProvisioningStart(final UnprovisionedMeshNode unprovisionedMesh
         startProvisioning.executeSend();
     }
 
-    private void sendProvisioningStartWithStaticOOB(final UnprovisionedMeshNode unprovisionedMeshNode) {
+    private void sendProvisioningStartWithStaticOOB(
+            final UnprovisionedMeshNode unprovisionedMeshNode) {
         final ProvisioningCapabilitiesState capabilitiesState = (ProvisioningCapabilitiesState) provisioningState;
         final ProvisioningCapabilities capabilities = capabilitiesState.getCapabilities();
 
@@ -392,7 +405,8 @@ private void sendProvisioningStartWithStaticOOB(final UnprovisionedMeshNode unpr
         startProvisioning.executeSend();
     }
 
-    private void sendProvisioningStartWithOutputOOB(final UnprovisionedMeshNode unprovisionedMeshNode, final OutputOOBAction action) {
+    private void sendProvisioningStartWithOutputOOB(
+            final UnprovisionedMeshNode unprovisionedMeshNode, final OutputOOBAction action) {
         final ProvisioningCapabilitiesState capabilitiesState = (ProvisioningCapabilitiesState) provisioningState;
         final ProvisioningCapabilities capabilities = capabilitiesState.getCapabilities();
 
@@ -410,7 +424,8 @@ private void sendProvisioningStartWithOutputOOB(final UnprovisionedMeshNode unpr
         startProvisioning.executeSend();
     }
 
-    private void sendProvisioningStartWithInputOOB(final UnprovisionedMeshNode unprovisionedMeshNode, final InputOOBAction action) {
+    private void sendProvisioningStartWithInputOOB(
+            final UnprovisionedMeshNode unprovisionedMeshNode, final InputOOBAction action) {
         final ProvisioningCapabilitiesState capabilitiesState = (ProvisioningCapabilitiesState) provisioningState;
         final ProvisioningCapabilities capabilities = capabilitiesState.getCapabilities();
 
@@ -442,11 +457,11 @@ private void sendProvisionerPublicKey(final UnprovisionedMeshNode unprovisionedM
         }
     }
 
-    private void parseProvisioneePublicKeyXY(final UnprovisionedMeshNode unprovisionedMeshNode, final byte[] data) {
+    private void parseProvisioneePublicKeyXY(
+            final UnprovisionedMeshNode unprovisionedMeshNode, final byte[] data) {
         if (provisioningState instanceof ProvisioningPublicKeyState) {
             final ProvisioningPublicKeyState provisioningPublicKeyState = ((ProvisioningPublicKeyState) provisioningState);
             isProvisioneePublicKeyReceived = provisioningPublicKeyState.parseData(data);
-
             if (isProvisioningPublicKeySent && isProvisioneePublicKeyReceived) {
                 switch (unprovisionedMeshNode.getAuthMethodUsed()) {
                     case STATIC_OOB_AUTHENTICATION:
@@ -527,7 +542,8 @@ private boolean validateMessage(final byte[] data) {
      * @param provisionerKeyXY xy components of the provisioner public key
      * @param provisioneeKeyXY xy components of the provisionee public key
      */
-    public final byte[] generateConfirmationInputs(final byte[] provisionerKeyXY, final byte[] provisioneeKeyXY) {
+    public final byte[] generateConfirmationInputs(final byte[] provisionerKeyXY,
+                                                   final byte[] provisioneeKeyXY) {
         //invite: 1 bytes, capabilities: 11 bytes, start: 5 bytes, provisionerKey: 64 bytes, deviceKey: 64 bytes
         //Append all the raw data together
         if (confirmationInputs != null) {
diff --git a/android-nrf-mesh-library/meshprovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/provisionerstates/ProvisioningFailedState.java b/android-nrf-mesh-library/meshprovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/provisionerstates/ProvisioningFailedState.java
index 39eb7abb1..116198ac4 100644
--- a/android-nrf-mesh-library/meshprovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/provisionerstates/ProvisioningFailedState.java
+++ b/android-nrf-mesh-library/meshprovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/provisionerstates/ProvisioningFailedState.java
@@ -29,14 +29,10 @@
 
 public class ProvisioningFailedState extends ProvisioningState {
 
-    private final Context mContext;
-    private final UnprovisionedMeshNode mUnprovisionedMeshNode;
     private int error;
 
-    public ProvisioningFailedState(final Context context, final UnprovisionedMeshNode unprovisionedMeshNode) {
+    public ProvisioningFailedState() {
         super();
-        this.mContext = context;
-        this.mUnprovisionedMeshNode = unprovisionedMeshNode;
     }
 
     @Override
@@ -86,35 +82,6 @@ public static String parseProvisioningFailure(final Context context, final int e
         }
     }
 
-    public static String parseProvisioningFailure(final Context context, final byte[] pdu) {
-        if(pdu == null)
-            return "Unknown";
-        final int errorCode = pdu[2];
-        switch (ProvisioningFailureCode.fromErrorCode(errorCode)) {
-            case PROHIBITED:
-                return context.getString(R.string.error_prohibited);
-            case INVALID_PDU:
-                return context.getString(R.string.error_invalid_pdu);
-            case INVALID_FORMAT:
-                return context.getString(R.string.error_invalid_format);
-            case UNEXPECTED_PDU:
-                return context.getString(R.string.error_prohibited);
-            case CONFIRMATION_FAILED:
-                return context.getString(R.string.error_confirmation_failed);
-            case OUT_OF_RESOURCES:
-                return context.getString(R.string.error_prohibited);
-            case DECRYPTION_FAILED:
-                return context.getString(R.string.error_decryption_failed);
-            case UNEXPECTED_ERROR:
-                return context.getString(R.string.error_unexpected_error);
-            case CANNOT_ASSIGN_ADDRESSES:
-                return context.getString(R.string.error_cannot_assign_addresses);
-            case UNKNOWN_ERROR_CODE:
-            default:
-                return context.getString(R.string.error_rfu);
-        }
-    }
-
     public enum ProvisioningFailureCode {
         PROHIBITED(0x00),
         INVALID_PDU(0x01),
diff --git a/android-nrf-mesh-library/meshprovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/provisionerstates/ProvisioningPublicKeyState.java b/android-nrf-mesh-library/meshprovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/provisionerstates/ProvisioningPublicKeyState.java
index 128b267d1..8254588ab 100644
--- a/android-nrf-mesh-library/meshprovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/provisionerstates/ProvisioningPublicKeyState.java
+++ b/android-nrf-mesh-library/meshprovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/provisionerstates/ProvisioningPublicKeyState.java
@@ -23,7 +23,6 @@
 package no.nordicsemi.android.meshprovisioner.provisionerstates;
 
 
-import androidx.annotation.NonNull;
 import android.util.Log;
 
 import org.spongycastle.jce.ECNamedCurveTable;
@@ -49,6 +48,7 @@
 
 import javax.crypto.KeyAgreement;
 
+import androidx.annotation.NonNull;
 import no.nordicsemi.android.meshprovisioner.InternalTransportCallbacks;
 import no.nordicsemi.android.meshprovisioner.MeshManagerApi;
 import no.nordicsemi.android.meshprovisioner.MeshProvisioningStatusCallbacks;
@@ -142,6 +142,10 @@ private byte[] generatePublicKeyXYPDU() {
     }
 
     private void generateSharedECDHSecret(final byte[] provisioneePublicKeyXYPDU) {
+        if (provisioneePublicKeyXYPDU.length != 66) {
+            throw new IllegalArgumentException("Invalid Provisionee Public Key PDU," +
+                    " length of the Provisionee public key must be 66 bytes, but was " + provisioneePublicKeyXYPDU.length);
+        }
         final ByteBuffer buffer = ByteBuffer.allocate(provisioneePublicKeyXYPDU.length - 2);
         buffer.put(provisioneePublicKeyXYPDU, 2, buffer.limit());
         final byte[] xy = mTempProvisioneeXY = buffer.array();
diff --git a/android-nrf-mesh-library/meshprovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/provisionerstates/ProvisioningState.java b/android-nrf-mesh-library/meshprovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/provisionerstates/ProvisioningState.java
index 90c6246d8..ab0ab6023 100644
--- a/android-nrf-mesh-library/meshprovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/provisionerstates/ProvisioningState.java
+++ b/android-nrf-mesh-library/meshprovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/provisionerstates/ProvisioningState.java
@@ -90,7 +90,7 @@ public enum States {
         SENDING_NETWORK_TRANSMIT_SET(23),
         NETWORK_TRANSMIT_STATUS_RECEIVED(24),
         SENDING_BLOCK_ACKNOWLEDGEMENT(98),
-        BLOCK_ACKNOWLEDGEMENT_RECEIVED(99),;
+        BLOCK_ACKNOWLEDGEMENT_RECEIVED(99);
 
         private int state;
 
@@ -102,9 +102,9 @@ public int getState() {
             return state;
         }
 
-        public static States fromStatusCode(final int statusCode){
-            for(States state : States.values()){
-                if(state.getState() == statusCode){
+        public static States fromStatusCode(final int statusCode) {
+            for (States state : States.values()) {
+                if (state.getState() == statusCode) {
                     return state;
                 }
             }