diff --git a/client/emv/emvjson.c b/client/emv/emvjson.c
index fc10f255c..dc409a2a5 100644
--- a/client/emv/emvjson.c
+++ b/client/emv/emvjson.c
@@ -259,7 +259,8 @@ bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t * buffer, s
 		return false;
 	}
 	
-	*bufferlen = buflen;
+	if ( bufferlen )
+		*bufferlen = buflen;
 	
 	return true;
 }