diff --git a/src/main/java/com/casper/sdk/jackson/deserializer/AbstractSerializedKeyTaggedHexDeserializer.java b/src/main/java/com/casper/sdk/jackson/deserializer/AbstractSerializedKeyTaggedHexDeserializer.java
index afebbf26..1f0eef55 100644
--- a/src/main/java/com/casper/sdk/jackson/deserializer/AbstractSerializedKeyTaggedHexDeserializer.java
+++ b/src/main/java/com/casper/sdk/jackson/deserializer/AbstractSerializedKeyTaggedHexDeserializer.java
@@ -1,8 +1,10 @@
 package com.casper.sdk.jackson.deserializer;
 
+import com.casper.sdk.exception.CasperClientException;
 import com.casper.sdk.exception.DeserializationException;
 import com.casper.sdk.exception.NoSuchKeyTagException;
 import com.casper.sdk.model.key.AbstractSerializedKeyTaggedHex;
+import com.casper.sdk.model.key.Key;
 import com.casper.sdk.model.key.Tag;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
@@ -28,17 +30,28 @@ public abstract class AbstractSerializedKeyTaggedHexDeserializer<T extends Abstr
     private static final String NULL_PUBLIC_KEY = "00";
 
     @Override
-    public T deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
-        JsonNode node = p.getCodec().readTree(p);
+    public T deserialize(final JsonParser p, final DeserializationContext ctxt) throws IOException {
+        final JsonNode node = p.getCodec().readTree(p);
 
-        if (NULL_PUBLIC_KEY.equals(node.textValue())) {
+        final String strKey = node.textValue();
+
+        if (strKey.contains("-")) {
+            try {
+                //noinspection unchecked
+                return (T) Key.fromKeyString(strKey);
+            } catch (NoSuchKeyTagException e) {
+                throw new CasperClientException("No such key: " + strKey, e);
+            }
+        }
+
+        if (NULL_PUBLIC_KEY.equals(strKey)) {
             return null;
         }
 
-        T object = this.getInstanceOf();
+        final T object = this.getInstanceOf();
 
         try {
-            byte[] bytes = ByteUtils.parseHexString(node.asText());
+            final byte[] bytes = ByteUtils.parseHexString(strKey);
             this.loadKey(object, bytes);
         } catch (NoSuchAlgorithmException | NoSuchKeyTagException e) {
             throw new DeserializationException("Problem deserializing Algorithm tagged hex string", e);
@@ -49,5 +62,5 @@ public T deserialize(JsonParser p, DeserializationContext ctxt) throws IOExcepti
 
     protected abstract T getInstanceOf();
 
-    protected abstract void loadKey(T key, byte[] bytes) throws NoSuchAlgorithmException, NoSuchKeyTagException;
+    protected abstract void loadKey(final T key, final byte[] bytes) throws NoSuchAlgorithmException, NoSuchKeyTagException;
 }
diff --git a/src/test/java/com/casper/sdk/model/key/KeyTest.java b/src/test/java/com/casper/sdk/model/key/KeyTest.java
index 3170cda2..bd872786 100644
--- a/src/test/java/com/casper/sdk/model/key/KeyTest.java
+++ b/src/test/java/com/casper/sdk/model/key/KeyTest.java
@@ -1,19 +1,18 @@
 package com.casper.sdk.model.key;
 
-import com.casper.sdk.exception.DynamicInstanceException;
-import com.casper.sdk.exception.NoSuchKeyTagException;
 import com.casper.sdk.model.common.Digest;
 import com.casper.sdk.model.entity.EntityAddr;
 import com.casper.sdk.model.uref.URef;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.syntifi.crypto.key.encdec.Hex;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.hamcrest.core.IsNull.notNullValue;
+import static org.hamcrest.core.IsNull.nullValue;
 
 /**
  * Unit tests for keys
@@ -23,10 +22,10 @@
 class KeyTest {
 
     @Test
-    void accountKeyFromKeyString() throws NoSuchKeyTagException {
+    void accountKeyFromKeyString() throws Exception {
 
         final String strKey = "account-hash-0101010101010101010101010101010101010101010101010101010101010101";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(notNullValue(Key.class)));
         assertThat(key.getTag(), is(KeyTag.ACCOUNT));
         assertThat(key.getKey(), is(Hex.decode("0101010101010101010101010101010101010101010101010101010101010101")));
@@ -35,10 +34,10 @@ void accountKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void hashKeyFromKeyString() throws NoSuchKeyTagException {
+    void hashKeyFromKeyString() throws Exception {
 
         final String strKey = "hash-0202020202020202020202020202020202020202020202020202020202020202";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(notNullValue(Key.class)));
         assertThat(key.getTag(), is(KeyTag.HASH));
         assertThat(key.getKey(), is(Hex.decode("0202020202020202020202020202020202020202020202020202020202020202")));
@@ -47,10 +46,10 @@ void hashKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void urefKeyFromKeyString() throws NoSuchKeyTagException, IOException, DynamicInstanceException {
+    void urefKeyFromKeyString() throws Exception {
 
         final String strKey = "uref-0303030303030303030303030303030303030303030303030303030303030303-001";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(URefKey.class)));
         assertThat(key.getTag(), is(KeyTag.UREF));
         assertThat(key.getKey(), is(Hex.decode("030303030303030303030303030303030303030303030303030303030303030301")));
@@ -65,10 +64,10 @@ void urefKeyFromKeyString() throws NoSuchKeyTagException, IOException, DynamicIn
     }
 
     @Test
-    void transferKeyFromKeyString() throws NoSuchKeyTagException {
+    void transferKeyFromKeyString() throws Exception {
 
         final String strKey = "transfer-0404040404040404040404040404040404040404040404040404040404040404";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(notNullValue(Key.class)));
         assertThat(key.getTag(), is(KeyTag.TRANSFER));
         assertThat(key.getKey(), is(Hex.decode("0404040404040404040404040404040404040404040404040404040404040404")));
@@ -77,10 +76,10 @@ void transferKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void deployKeyFromKeyString() throws NoSuchKeyTagException {
+    void deployKeyFromKeyString() throws Exception {
 
         final String strKey = "deploy-0505050505050505050505050505050505050505050505050505050505050505";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(notNullValue(Key.class)));
         assertThat(key.getTag(), is(KeyTag.DEPLOY_INFO));
         assertThat(key.getKey(), is(Hex.decode("0505050505050505050505050505050505050505050505050505050505050505")));
@@ -89,10 +88,10 @@ void deployKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void eraInfoKeyFromKeyString() throws NoSuchKeyTagException {
+    void eraInfoKeyFromKeyString() throws Exception {
 
         final String strKey = "era-12345";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(EraInfoKey.class)));
         assertThat(key.getTag(), is(KeyTag.ERA_INFO));
         assertThat(key.getKey(), is(Hex.decode("3930000000000000")));
@@ -101,10 +100,10 @@ void eraInfoKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void balanceKeyFromKeyString() throws NoSuchKeyTagException {
+    void balanceKeyFromKeyString() throws Exception {
 
         final String strKey = "balance-0707070707070707070707070707070707070707070707070707070707070707";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(notNullValue(Key.class)));
         assertThat(key.getTag(), is(KeyTag.BALANCE));
         assertThat(key.getKey(), is(Hex.decode("0707070707070707070707070707070707070707070707070707070707070707")));
@@ -113,10 +112,10 @@ void balanceKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void bidKeyFromKeyString() throws NoSuchKeyTagException {
+    void bidKeyFromKeyString() throws Exception {
 
         final String strKey = "bid-0808080808080808080808080808080808080808080808080808080808080808";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(notNullValue(Key.class)));
         assertThat(key.getTag(), is(KeyTag.BID));
         assertThat(key.getKey(), is(Hex.decode("0808080808080808080808080808080808080808080808080808080808080808")));
@@ -125,10 +124,10 @@ void bidKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void withdrawKeyFromKeyString() throws NoSuchKeyTagException {
+    void withdrawKeyFromKeyString() throws Exception {
 
         final String strKey = "withdraw-0909090909090909090909090909090909090909090909090909090909090909";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(notNullValue(Key.class)));
         assertThat(key.getTag(), is(KeyTag.WITHDRAW));
         assertThat(key.getKey(), is(Hex.decode("0909090909090909090909090909090909090909090909090909090909090909")));
@@ -137,10 +136,10 @@ void withdrawKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void dictionaryKeyFromKeyString() throws NoSuchKeyTagException {
+    void dictionaryKeyFromKeyString() throws Exception {
 
         final String strKey = "dictionary-1010101010101010101010101010101010101010101010101010101010101010";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(notNullValue(Key.class)));
         assertThat(key.getTag(), is(KeyTag.DICTIONARY));
         assertThat(key.getKey(), is(Hex.decode("1010101010101010101010101010101010101010101010101010101010101010")));
@@ -149,10 +148,10 @@ void dictionaryKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void systemContractRegistryKeyFromKeyString() throws NoSuchKeyTagException {
+    void systemContractRegistryKeyFromKeyString() throws Exception {
 
         final String strKey = "system-contract-registry-0909090909090909090909090909090909090909090909090909090909090909";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(notNullValue(Key.class)));
         assertThat(key.getTag(), is(KeyTag.SYSTEM_ENTITY_REGISTRY));
         assertThat(key.getKey(), is(Hex.decode("0909090909090909090909090909090909090909090909090909090909090909")));
@@ -161,10 +160,10 @@ void systemContractRegistryKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void eraSummaryKeyFromKeyString() throws NoSuchKeyTagException {
+    void eraSummaryKeyFromKeyString() throws Exception {
 
         final String strKey = "era-summary-0909090909090909090909090909090909090909090909090909090909090909";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(notNullValue(Key.class)));
         assertThat(key.getTag(), is(KeyTag.ERA_SUMMARY));
         assertThat(key.getKey(), is(Hex.decode("0909090909090909090909090909090909090909090909090909090909090909")));
@@ -173,10 +172,10 @@ void eraSummaryKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void unbondKeyFromKeyString() throws NoSuchKeyTagException {
+    void unbondKeyFromKeyString() throws Exception {
 
         final String strKey = "unbond-0909090909090909090909090909090909090909090909090909090909090909";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(notNullValue(Key.class)));
         assertThat(key.getTag(), is(KeyTag.UNBOND));
         assertThat(key.getKey(), is(Hex.decode("0909090909090909090909090909090909090909090909090909090909090909")));
@@ -185,10 +184,10 @@ void unbondKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void chainspecRegistryKeyFromKeyString() throws NoSuchKeyTagException {
+    void chainspecRegistryKeyFromKeyString() throws Exception {
 
         final String strKey = "chainspec-registry-0909090909090909090909090909090909090909090909090909090909090909";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(notNullValue(Key.class)));
         assertThat(key.getTag(), is(KeyTag.CHAINSPEC_REGISTRY));
         assertThat(key.getKey(), is(Hex.decode("0909090909090909090909090909090909090909090909090909090909090909")));
@@ -197,10 +196,10 @@ void chainspecRegistryKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void checksumRegistryKeyFromKeyString() throws NoSuchKeyTagException {
+    void checksumRegistryKeyFromKeyString() throws Exception {
 
         final String strKey = "checksum-registry-0909090909090909090909090909090909090909090909090909090909090909";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(notNullValue(Key.class)));
         assertThat(key.getTag(), is(KeyTag.CHECKSUM_REGISTRY));
         assertThat(key.getKey(), is(Hex.decode("0909090909090909090909090909090909090909090909090909090909090909")));
@@ -209,10 +208,10 @@ void checksumRegistryKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void contractPackageKeyFromKeyString() throws NoSuchKeyTagException {
+    void contractPackageKeyFromKeyString() throws Exception {
 
         final String strKey = "contract-package-0909090909090909090909090909090909090909090909090909090909090909";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(notNullValue(Key.class)));
         assertThat(key.getTag(), is(KeyTag.HASH));
         assertThat(key.getKey(), is(Hex.decode("0909090909090909090909090909090909090909090909090909090909090909")));
@@ -221,10 +220,10 @@ void contractPackageKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void contractWasmKeyFromKeyString() throws NoSuchKeyTagException {
+    void contractWasmKeyFromKeyString() throws Exception {
 
         final String strKey = "contract-wasm-0909090909090909090909090909090909090909090909090909090909090909";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(notNullValue(Key.class)));
         assertThat(key.getTag(), is(KeyTag.HASH));
         assertThat(key.getKey(), is(Hex.decode("0909090909090909090909090909090909090909090909090909090909090909")));
@@ -233,10 +232,10 @@ void contractWasmKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void contractKeyFromKeyString() throws NoSuchKeyTagException {
+    void contractKeyFromKeyString() throws Exception {
 
         final String strKey = "contract-0909090909090909090909090909090909090909090909090909090909090909";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(notNullValue(Key.class)));
         assertThat(key.getTag(), is(KeyTag.HASH));
         assertThat(key.getKey(), is(Hex.decode("0909090909090909090909090909090909090909090909090909090909090909")));
@@ -245,10 +244,10 @@ void contractKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void bidAddrKeyUnifiedFromKeyString() throws NoSuchKeyTagException {
+    void bidAddrKeyUnifiedFromKeyString() throws Exception {
 
         final String strKey = "bid-addr-002f3fb80d362ad0a922f446915a259c9aaec9ba99292b3e50ff2359c458007309";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(BidAddrKey.class)));
         assertThat(key.getTag(), is(KeyTag.BID_ADDR));
         assertThat(key.getKey(), is(Hex.decode("002f3fb80d362ad0a922f446915a259c9aaec9ba99292b3e50ff2359c458007309")));
@@ -258,10 +257,10 @@ void bidAddrKeyUnifiedFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void bidAddrKeyValidatorFromKeyString() throws NoSuchKeyTagException {
+    void bidAddrKeyValidatorFromKeyString() throws Exception {
 
         final String strKey = "bid-addr-012f3fb80d362ad0a922f446915a259c9aaec9ba99292b3e50ff2359c458007309";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(BidAddrKey.class)));
         assertThat(key.getTag(), is(KeyTag.BID_ADDR));
         assertThat(key.getKey(), is(Hex.decode("012f3fb80d362ad0a922f446915a259c9aaec9ba99292b3e50ff2359c458007309")));
@@ -271,10 +270,10 @@ void bidAddrKeyValidatorFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void bidAddrKeyDelegatorFromKeyString() throws NoSuchKeyTagException {
+    void bidAddrKeyDelegatorFromKeyString() throws Exception {
 
         final String strKey = "bid-addr-022f3fb80d362ad0a922f446915a259c9aaec9ba99292b3e50ff2359c4580073099fa1fc0808d3a5b9ea9f3af4ca7c8c3655568fdf378d8afdf8a7e56e58abbfd4";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(BidAddrKey.class)));
         assertThat(key.getTag(), is(KeyTag.BID_ADDR));
         assertThat(key.getKey(), is(Hex.decode("022f3fb80d362ad0a922f446915a259c9aaec9ba99292b3e50ff2359c4580073099fa1fc0808d3a5b9ea9f3af4ca7c8c3655568fdf378d8afdf8a7e56e58abbfd4")));
@@ -284,10 +283,10 @@ void bidAddrKeyDelegatorFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void bidAddrKeyCreditFromKeyString() throws NoSuchKeyTagException {
+    void bidAddrKeyCreditFromKeyString() throws Exception {
 
         final String strKey = "bid-addr-04520037cd249ccbcfeb0b9feae07d8d4f7d922cf88adc4f3e8691f9d34ccc8d097f00000000000000";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(BidAddrKey.class)));
         assertThat(key.getTag(), is(KeyTag.BID_ADDR));
         assertThat(key.getKey(), is(Hex.decode("04520037cd249ccbcfeb0b9feae07d8d4f7d922cf88adc4f3e8691f9d34ccc8d097f00000000000000")));
@@ -297,10 +296,10 @@ void bidAddrKeyCreditFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void packageKeyFromKeyString() throws NoSuchKeyTagException {
+    void packageKeyFromKeyString() throws Exception {
 
         final String strKey = "package-0909090909090909090909090909090909090909090909090909090909090909";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(Key.class)));
         assertThat(key.getTag(), is(KeyTag.PACKAGE));
         assertThat(key.getKey(), is(Hex.decode("0909090909090909090909090909090909090909090909090909090909090909")));
@@ -309,10 +308,10 @@ void packageKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void addressableEntitySystemKeyFromKeyString() throws NoSuchKeyTagException {
+    void addressableEntitySystemKeyFromKeyString() throws Exception {
 
         final String strKey = "entity-system-0101010101010101010101010101010101010101010101010101010101010101";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(AddressableEntityKey.class)));
         assertThat(key.getTag(), is(KeyTag.ADDRESSABLE_ENTITY));
         assertThat(key.getKey(), is(Hex.decode("000101010101010101010101010101010101010101010101010101010101010101")));
@@ -322,10 +321,10 @@ void addressableEntitySystemKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void addressableEntityAccountKeyFromKeyString() throws NoSuchKeyTagException {
+    void addressableEntityAccountKeyFromKeyString() throws Exception {
 
         final String strKey = "entity-account-0101010101010101010101010101010101010101010101010101010101010101";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(AddressableEntityKey.class)));
         assertThat(key.getTag(), is(KeyTag.ADDRESSABLE_ENTITY));
         assertThat(key.getKey(), is(Hex.decode("010101010101010101010101010101010101010101010101010101010101010101")));
@@ -335,10 +334,10 @@ void addressableEntityAccountKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void addressableEntityContractKeyFromKeyString() throws NoSuchKeyTagException {
+    void addressableEntityContractKeyFromKeyString() throws Exception {
 
         final String strKey = "entity-contract-0101010101010101010101010101010101010101010101010101010101010101";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(AddressableEntityKey.class)));
         assertThat(key.getTag(), is(KeyTag.ADDRESSABLE_ENTITY));
         assertThat(key.getKey(), is(Hex.decode("020101010101010101010101010101010101010101010101010101010101010101")));
@@ -348,10 +347,10 @@ void addressableEntityContractKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void byteCodeEmptyKeyFromKeyString() throws NoSuchKeyTagException {
+    void byteCodeEmptyKeyFromKeyString() throws Exception {
 
         final String strKey = "byte-code-empty-0101010101010101010101010101010101010101010101010101010101010101";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(ByteCodeKey.class)));
         assertThat(key.getTag(), is(KeyTag.BYTE_CODE));
         assertThat(key.getKey(), is(Hex.decode("010101010101010101010101010101010101010101010101010101010101010101")));
@@ -361,10 +360,10 @@ void byteCodeEmptyKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void byteCodeV1WasmKeyFromKeyString() throws NoSuchKeyTagException {
+    void byteCodeV1WasmKeyFromKeyString() throws Exception {
 
         final String strKey = "byte-code-v1-wasm-0101010101010101010101010101010101010101010101010101010101010101";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(ByteCodeKey.class)));
         assertThat(key.getTag(), is(KeyTag.BYTE_CODE));
         assertThat(key.getKey(), is(Hex.decode("000101010101010101010101010101010101010101010101010101010101010101")));
@@ -374,10 +373,10 @@ void byteCodeV1WasmKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void messageTopicKeyFromKeyString() throws NoSuchKeyTagException {
+    void messageTopicKeyFromKeyString() throws Exception {
 
         final String strKey = "message-topic-entity-contract-55d4a6915291da12afded37fa5bc01f0803a2f0faf6acb7ec4c7ca6ab76f3330-5721a6d9d7a9afe5dfdb35276fb823bed0f825350e4d865a5ec0110c380de4e1";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(MessageKey.class)));
         assertThat(key.getTag(), is(KeyTag.MESSAGE));
         assertThat(key.getKey(), is(Hex.decode("0255d4a6915291da12afded37fa5bc01f0803a2f0faf6acb7ec4c7ca6ab76f33305721a6d9d7a9afe5dfdb35276fb823bed0f825350e4d865a5ec0110c380de4e100")));
@@ -389,10 +388,10 @@ void messageTopicKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void messageIndexKeyFromKeyString() throws NoSuchKeyTagException {
+    void messageIndexKeyFromKeyString() throws Exception {
 
         final String strKey = "message-entity-contract-55d4a6915291da12afded37fa5bc01f0803a2f0faf6acb7ec4c7ca6ab76f3330-5721a6d9d7a9afe5dfdb35276fb823bed0f825350e4d865a5ec0110c380de4e1-f";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(MessageKey.class)));
         assertThat(key.getTag(), is(KeyTag.MESSAGE));
         assertThat(key.toString(), is(strKey));
@@ -405,10 +404,10 @@ void messageIndexKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void namedKeyFromKeyString() throws NoSuchKeyTagException {
+    void namedKeyFromKeyString() throws Exception {
 
         final String strKey = "named-key-entity-system-0101010101010101010101010101010101010101010101010101010101010101-0202020202020202020202020202020202020202020202020202020202020202";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(NamedKeyKey.class)));
         assertThat(key.getTag(), is(KeyTag.NAMED_KEY));
         assertThat(key.toString(), is(strKey));
@@ -419,10 +418,10 @@ void namedKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void blockTimeKeyFromKeyString() throws NoSuchKeyTagException {
+    void blockTimeKeyFromKeyString() throws Exception {
 
         final String strKey = "block-time-0909090909090909090909090909090909090909090909090909090909090909";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(BlockGlobalKey.class)));
         assertThat(key.getTag(), is(KeyTag.BLOCK_GLOBAL));
         assertThat(key.toString(), is("block-time-0909090909090909090909090909090909090909090909090909090909090909"));
@@ -432,10 +431,10 @@ void blockTimeKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void blockMessageCountKeyFromKeyString() throws NoSuchKeyTagException {
+    void blockMessageCountKeyFromKeyString() throws Exception {
 
         final String strKey = "block-message-count-0909090909090909090909090909090909090909090909090909090909090909";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(BlockGlobalKey.class)));
         assertThat(key.getTag(), is(KeyTag.BLOCK_GLOBAL));
         assertThat(key.toString(), is(strKey));
@@ -445,10 +444,10 @@ void blockMessageCountKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void entryPointKeyFromKeyString() throws NoSuchKeyTagException {
+    void entryPointKeyFromKeyString() throws Exception {
 
         final String strKey = "entry-point-v2-entity-contract-2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a-1";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(EntryPointKey.class)));
         assertThat(key.getTag(), is(KeyTag.ENTRY_POINT));
         assertThat(key.toString(), is(strKey));
@@ -460,10 +459,10 @@ void entryPointKeyFromKeyString() throws NoSuchKeyTagException {
     }
 
     @Test
-    void balanceHoldKeyFromKeyString() throws NoSuchKeyTagException {
+    void balanceHoldKeyFromKeyString() throws Exception {
 
         final String strKey = "balance-hold-0000000000000000000000000000000000000000000000000000000000000000000000000000000000";
-        final Key key = Key.fromKeyString(strKey);
+        final Key key = fromJson(strKey);
         assertThat(key, is(instanceOf(BalanceHoldKey.class)));
         assertThat(key.getTag(), is(KeyTag.BALANCE_HOLD));
         assertThat(key.toString(), is(strKey));
@@ -471,5 +470,16 @@ void balanceHoldKeyFromKeyString() throws NoSuchKeyTagException {
         assertThat(((BalanceHoldKey) key).getBalanceHoldAddr(), is(BalanceHoldAddr.GAS));
         assertThat(key.getKey(), is(Hex.decode("0000000000000000000000000000000000000000000000000000000000000000000000000000000000")));
     }
+
+    @Test
+    void nullKeyFromJson() throws Exception {
+        final Key key = fromJson(null);
+        assertThat(key, is(nullValue()));
+    }
+
+    private Key fromJson(final String strKey) throws JsonProcessingException {
+        //noinspection VulnerableCodeUsages
+        return new ObjectMapper().readValue(strKey != null ? "\"" + strKey + "\"" : "null", Key.class);
+    }
 }