diff --git a/jni/com_android_nfc_NativeLlcpSocket.cpp b/jni/com_android_nfc_NativeLlcpSocket.cpp
index c4df5c3..fb6fd22 100644
--- a/jni/com_android_nfc_NativeLlcpSocket.cpp
+++ b/jni/com_android_nfc_NativeLlcpSocket.cpp
@@ -322,7 +322,7 @@
    {
        /* Return status should be either SUCCESS or PENDING */
        LOGE("phLibNfc_Llcp_Recv() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
-       return 0;
+       goto clean_and_return;
    }
    TRACE("phLibNfc_Llcp_Recv() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));