1 files changed, 21 insertions, 21 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index f5838d013..378f34122 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -376,27 +376,23 @@ namespace tools
   bool wallet_rpc_server::on_create_address(const wallet_rpc::COMMAND_RPC_CREATE_ADDRESS::request& req, wallet_rpc::COMMAND_RPC_CREATE_ADDRESS::response& res, epee::json_rpc::error& er)
   {
     if (!m_wallet) return not_open(er);
-    m_wallet->add_subaddress(req.account_index, req.label);
-    res.address_index = m_wallet->get_num_subaddresses(req.account_index) - 1;
-    res.address = m_wallet->get_subaddress_as_str({req.account_index, res.address_index});
+    try
+    {
+      m_wallet->add_subaddress(req.account_index, req.label);
+      res.address_index = m_wallet->get_num_subaddresses(req.account_index) - 1;
+      res.address = m_wallet->get_subaddress_as_str({req.account_index, res.address_index});
+    }
+    catch (const std::exception& e)
+    {
+      handle_rpc_exception(std::current_exception(), er, WALLET_RPC_ERROR_CODE_UNKNOWN_ERROR);
+      return false;
+    }
     return true;
   }
   //------------------------------------------------------------------------------------------------------------------------------
   bool wallet_rpc_server::on_label_address(const wallet_rpc::COMMAND_RPC_LABEL_ADDRESS::request& req, wallet_rpc::COMMAND_RPC_LABEL_ADDRESS::response& res, epee::json_rpc::error& er)
   {
     if (!m_wallet) return not_open(er);
-    if (req.index.major >= m_wallet->get_num_subaddress_accounts())
-    {
-      er.code = WALLET_RPC_ERROR_CODE_ACCOUNT_INDEX_OUTOFBOUND;
-      er.message = "Account index is out of bound";
-      return false;
-    }
-    if (req.index.minor >= m_wallet->get_num_subaddresses(req.index.major))
-    {
-      er.code = WALLET_RPC_ERROR_CODE_ADDRESS_INDEX_OUTOFBOUND;
-      er.message = "Address index is out of bound";
-      return false;
-    }
     try
     {
       m_wallet->set_subaddress_label(req.index, req.label);
@@ -458,12 +454,6 @@ namespace tools
   bool wallet_rpc_server::on_label_account(const wallet_rpc::COMMAND_RPC_LABEL_ACCOUNT::request& req, wallet_rpc::COMMAND_RPC_LABEL_ACCOUNT::response& res, epee::json_rpc::error& er)
   {
     if (!m_wallet) return not_open(er);
-    if (req.account_index >= m_wallet->get_num_subaddress_accounts())
-    {
-      er.code = WALLET_RPC_ERROR_CODE_ACCOUNT_INDEX_OUTOFBOUND;
-      er.message = "Account index is out of bound";
-      return false;
-    }
     try
     {
       m_wallet->set_subaddress_label({req.account_index, 0}, req.label);
@@ -2041,6 +2031,16 @@ namespace tools
       er.code = WALLET_RPC_ERROR_CODE_INVALID_PASSWORD;
       er.message = "Invalid password.";
     }
+    catch (const error::account_index_outofbound& e)
+    {
+      er.code = WALLET_RPC_ERROR_CODE_ACCOUNT_INDEX_OUTOFBOUND;
+      er.message = e.what();
+    }
+    catch (const error::address_index_outofbound& e)
+    {
+      er.code = WALLET_RPC_ERROR_CODE_ADDRESS_INDEX_OUTOFBOUND;
+      er.message = e.what();
+    }
     catch (const std::exception& e)
     {
       er.code = default_error_code;