diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcError.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcError.java
index eb0768e364..769650ee41 100644
--- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcError.java
+++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcError.java
@@ -118,7 +118,7 @@ public String getMessage() {
   public static JsonRpcError fromJson(
       @JsonProperty("code") final int code, @JsonProperty("message") final String message) {
     for (final JsonRpcError error : JsonRpcError.values()) {
-      if (error.getCode() == code) {
+      if (error.code == code && error.message.equals(message)) {
         return error;
       }
     }