diff --git a/src/rpc/RPCHelpers.cpp b/src/rpc/RPCHelpers.cpp
index aeeb7dfc..3a97f133 100644
--- a/src/rpc/RPCHelpers.cpp
+++ b/src/rpc/RPCHelpers.cpp
@@ -1173,25 +1173,19 @@ parseBook(ripple::Currency pays, ripple::AccountID payIssuer, ripple::Currency g
     if (isXRP(pays) && !isXRP(payIssuer))
     {
         return Status{
-            RippledError::rpcSRC_ISR_MALFORMED,
-            "Unneeded field 'taker_pays.issuer' for XRP currency "
-            "specification."};
+            RippledError::rpcSRC_ISR_MALFORMED, "Unneeded field 'taker_pays.issuer' for XRP currency specification."};
     }
 
     if (!isXRP(pays) && isXRP(payIssuer))
     {
         return Status{
-            RippledError::rpcSRC_ISR_MALFORMED,
-            "Invalid field 'taker_pays.issuer', expected non-XRP "
-            "issuer."};
+            RippledError::rpcSRC_ISR_MALFORMED, "Invalid field 'taker_pays.issuer', expected non-XRP issuer."};
     }
 
     if (ripple::isXRP(gets) && !ripple::isXRP(getIssuer))
     {
         return Status{
-            RippledError::rpcDST_ISR_MALFORMED,
-            "Unneeded field 'taker_gets.issuer' for XRP currency "
-            "specification."};
+            RippledError::rpcDST_ISR_MALFORMED, "Unneeded field 'taker_gets.issuer' for XRP currency specification."};
     }
 
     if (!ripple::isXRP(gets) && ripple::isXRP(getIssuer))
@@ -1267,17 +1261,13 @@ parseBook(boost::json::object const& request)
     if (isXRP(pay_currency) && !isXRP(pay_issuer))
     {
         return Status{
-            RippledError::rpcSRC_ISR_MALFORMED,
-            "Unneeded field 'taker_pays.issuer' for XRP currency "
-            "specification."};
+            RippledError::rpcSRC_ISR_MALFORMED, "Unneeded field 'taker_pays.issuer' for XRP currency specification."};
     }
 
     if (!isXRP(pay_currency) && isXRP(pay_issuer))
     {
         return Status{
-            RippledError::rpcSRC_ISR_MALFORMED,
-            "Invalid field 'taker_pays.issuer', expected non-XRP "
-            "issuer."};
+            RippledError::rpcSRC_ISR_MALFORMED, "Invalid field 'taker_pays.issuer', expected non-XRP issuer."};
     }
 
     if ((!isXRP(pay_currency)) && (!taker_pays.contains("issuer")))
@@ -1296,9 +1286,7 @@ parseBook(boost::json::object const& request)
         if (get_issuer == ripple::noAccount())
         {
             return Status{
-                RippledError::rpcDST_ISR_MALFORMED,
-                "Invalid field 'taker_gets.issuer', bad issuer account "
-                "one."};
+                RippledError::rpcDST_ISR_MALFORMED, "Invalid field 'taker_gets.issuer', bad issuer account one."};
         }
     }
     else
@@ -1309,9 +1297,7 @@ parseBook(boost::json::object const& request)
     if (ripple::isXRP(get_currency) && !ripple::isXRP(get_issuer))
     {
         return Status{
-            RippledError::rpcDST_ISR_MALFORMED,
-            "Unneeded field 'taker_gets.issuer' for XRP currency "
-            "specification."};
+            RippledError::rpcDST_ISR_MALFORMED, "Unneeded field 'taker_gets.issuer' for XRP currency specification."};
     }
 
     if (!ripple::isXRP(get_currency) && ripple::isXRP(get_issuer))
diff --git a/src/rpc/common/Validators.cpp b/src/rpc/common/Validators.cpp
index 5efa527a..f6441816 100644
--- a/src/rpc/common/Validators.cpp
+++ b/src/rpc/common/Validators.cpp
@@ -147,11 +147,7 @@ CustomValidator IssuerValidator =
         if (issuer == ripple::noAccount())
         {
             return Error{Status{
-                RippledError::rpcINVALID_PARAMS,
-                fmt::format(
-                    "Invalid field '{}', bad issuer account "
-                    "one.",
-                    key)}};
+                RippledError::rpcINVALID_PARAMS, fmt::format("Invalid field '{}', bad issuer account one.", key)}};
         }
 
         return MaybeError{};
diff --git a/src/rpc/common/Validators.h b/src/rpc/common/Validators.h
index 71375c71..2fda743b 100644
--- a/src/rpc/common/Validators.h
+++ b/src/rpc/common/Validators.h
@@ -421,7 +421,7 @@ public:
 
         auto const res = value_to<Type>(value.as_object().at(key.data()));
         if (std::find(std::begin(options_), std::end(options_), res) == std::end(options_))
-            return Error{Status{RippledError::rpcINVALID_PARAMS}};
+            return Error{Status{RippledError::rpcINVALID_PARAMS, fmt::format("Invalid field '{}'.", key)}};
 
         return {};
     }
diff --git a/src/rpc/handlers/AccountTx.cpp b/src/rpc/handlers/AccountTx.cpp
index 81eeb423..9d8eab2e 100644
--- a/src/rpc/handlers/AccountTx.cpp
+++ b/src/rpc/handlers/AccountTx.cpp
@@ -105,9 +105,7 @@ AccountTxHandler::process(AccountTxHandler::Input input, Context const& ctx) con
     if (input.ledgerHash || input.ledgerIndex || input.usingValidatedLedger)
     {
         if (ctx.apiVersion > 1u && (input.ledgerIndexMax || input.ledgerIndexMin))
-        {
             return Error{Status{RippledError::rpcINVALID_PARAMS, "containsLedgerSpecifierAndRange"}};
-        }
 
         if (!input.ledgerIndexMax && !input.ledgerIndexMin)
         {
diff --git a/src/rpc/handlers/BookOffers.h b/src/rpc/handlers/BookOffers.h
index e1cdff34..c42d8d23 100644
--- a/src/rpc/handlers/BookOffers.h
+++ b/src/rpc/handlers/BookOffers.h
@@ -95,7 +95,7 @@ public:
             // return INVALID_PARAMS if account format is wrong for "taker"
             {JS(taker),
              meta::WithCustomError{
-                 validation::AccountValidator, Status(RippledError::rpcINVALID_PARAMS, "Invalid field 'taker'")}},
+                 validation::AccountValidator, Status(RippledError::rpcINVALID_PARAMS, "Invalid field 'taker'.")}},
             {JS(limit),
              validation::Type<uint32_t>{},
              validation::Min(1u),
diff --git a/src/rpc/handlers/LedgerData.h b/src/rpc/handlers/LedgerData.h
index 22643606..497df40c 100644
--- a/src/rpc/handlers/LedgerData.h
+++ b/src/rpc/handlers/LedgerData.h
@@ -100,9 +100,7 @@ public:
              meta::WithCustomError{
                  validation::Type<std::string>{},
                  Status{ripple::rpcINVALID_PARAMS, "Invalid field 'type', not string."}},
-             meta::WithCustomError{
-                 validation::OneOf<std::string>(TYPES_KEYS.cbegin(), TYPES_KEYS.cend()),
-                 Status{ripple::rpcINVALID_PARAMS, "Invalid field 'type'."}}},
+             validation::OneOf<std::string>(TYPES_KEYS.cbegin(), TYPES_KEYS.cend())},
 
         };
         return rpcSpec;
diff --git a/unittests/rpc/handlers/AccountObjectsTests.cpp b/unittests/rpc/handlers/AccountObjectsTests.cpp
index d3967223..a132983b 100644
--- a/unittests/rpc/handlers/AccountObjectsTests.cpp
+++ b/unittests/rpc/handlers/AccountObjectsTests.cpp
@@ -85,7 +85,7 @@ generateTestValuesForParametersTest()
             "TypeInvalid",
             R"({"account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "type":"wrong"})",
             "invalidParams",
-            "Invalid parameters."},
+            "Invalid field 'type'."},
         AccountObjectsParamTestCaseBundle{
             "LedgerHashInvalid",
             R"({"account":"rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun", "ledger_hash":"1"})",
diff --git a/unittests/rpc/handlers/BookOffersTests.cpp b/unittests/rpc/handlers/BookOffersTests.cpp
index 6bbfd90e..81b9402c 100644
--- a/unittests/rpc/handlers/BookOffersTests.cpp
+++ b/unittests/rpc/handlers/BookOffersTests.cpp
@@ -256,7 +256,7 @@ generateParameterBookOffersTestBundles()
                 "taker": "123"
             })",
             "invalidParams",
-            "Invalid field 'taker'"},
+            "Invalid field 'taker'."},
         ParameterTestBundle{
             "TakerNotString",
             R"({
@@ -272,7 +272,7 @@ generateParameterBookOffersTestBundles()
                 "taker": 123
             })",
             "invalidParams",
-            "Invalid field 'taker'"},
+            "Invalid field 'taker'."},
         ParameterTestBundle{
             "LimitNotInt",
             R"({
@@ -384,8 +384,7 @@ generateParameterBookOffersTestBundles()
                 }
             })",
             "srcIsrMalformed",
-            "Unneeded field 'taker_pays.issuer' for XRP currency "
-            "specification."},
+            "Unneeded field 'taker_pays.issuer' for XRP currency specification."},
         ParameterTestBundle{
             "PaysCurrencyWithXRPIssuer",
             R"({
@@ -430,8 +429,7 @@ generateParameterBookOffersTestBundles()
                 }            
             })",
             "dstIsrMalformed",
-            "Unneeded field 'taker_gets.issuer' for XRP currency "
-            "specification."},
+            "Unneeded field 'taker_gets.issuer' for XRP currency specification."},
         ParameterTestBundle{
             "BadMarket",
             R"({
diff --git a/unittests/rpc/handlers/SubscribeTests.cpp b/unittests/rpc/handlers/SubscribeTests.cpp
index f5e7b267..5b07afba 100644
--- a/unittests/rpc/handlers/SubscribeTests.cpp
+++ b/unittests/rpc/handlers/SubscribeTests.cpp
@@ -410,8 +410,7 @@ generateTestValuesForParametersTest()
                 ]
             })",
             "dstIsrMalformed",
-            "Unneeded field 'taker_gets.issuer' for XRP currency "
-            "specification."},
+            "Unneeded field 'taker_gets.issuer' for XRP currency specification."},
         SubscribeParamTestCaseBundle{
             "BooksItemTakerPaysXRPHasIssuer",
             R"({
@@ -430,8 +429,7 @@ generateTestValuesForParametersTest()
                 ]
             })",
             "srcIsrMalformed",
-            "Unneeded field 'taker_pays.issuer' for XRP currency "
-            "specification."},
+            "Unneeded field 'taker_pays.issuer' for XRP currency specification."},
         SubscribeParamTestCaseBundle{
             "BooksItemBadMartket",
             R"({
diff --git a/unittests/rpc/handlers/UnsubscribeTests.cpp b/unittests/rpc/handlers/UnsubscribeTests.cpp
index fecf3c6a..2532cc83 100644
--- a/unittests/rpc/handlers/UnsubscribeTests.cpp
+++ b/unittests/rpc/handlers/UnsubscribeTests.cpp
@@ -405,8 +405,7 @@ generateTestValuesForParametersTest()
                 ]
             })",
             "dstIsrMalformed",
-            "Unneeded field 'taker_gets.issuer' for XRP currency "
-            "specification."},
+            "Unneeded field 'taker_gets.issuer' for XRP currency specification."},
         UnsubscribeParamTestCaseBundle{
             "BooksItemTakerPaysXRPHasIssuer",
             R"({
@@ -426,8 +425,7 @@ generateTestValuesForParametersTest()
                 ]
             })",
             "srcIsrMalformed",
-            "Unneeded field 'taker_pays.issuer' for XRP currency "
-            "specification."},
+            "Unneeded field 'taker_pays.issuer' for XRP currency specification."},
         UnsubscribeParamTestCaseBundle{
             "BooksItemBadMartket",
             R"({