diff --git a/libraries/chain/include/eos/chain/types.hpp b/libraries/chain/include/eos/chain/types.hpp
index a121d3c199f..f731f548a32 100644
--- a/libraries/chain/include/eos/chain/types.hpp
+++ b/libraries/chain/include/eos/chain/types.hpp
@@ -171,7 +171,7 @@ namespace eos { namespace chain {
       transaction_object_type,
       producer_object_type,
       chain_property_object_type,
-      transaction_history_object_type, ///< Defined by account history plugin library
+      transaction_history_object_type, ///< Defined by account_history_plugin library
       balance_object_type, ///< Defined by native_contract library
       staked_balance_object_type, ///< Defined by native_contract library
       producer_votes_object_type, ///< Defined by native_contract library
diff --git a/plugins/account_history_plugin/account_history_plugin.cpp b/plugins/account_history_plugin/account_history_plugin.cpp
index 9c1a2f57f61..d8e891b7bb4 100644
--- a/plugins/account_history_plugin/account_history_plugin.cpp
+++ b/plugins/account_history_plugin/account_history_plugin.cpp
@@ -64,12 +64,8 @@ ProcessedTransaction account_history_plugin_impl::get_transaction(const chain::t
       }
 
       // ERROR in indexing logic
-      std::string msg = "transaction_id=" + transaction_id.str() + " indexed with block_id=" + block_id->str() + ", but ";
-      if (!block)
-         msg += "block was not found";
-      else
-         msg += "transaction was not found in the block";
-      BOOST_THROW_EXCEPTION( std::runtime_error( msg ) );
+      FC_ASSERT(block, "Transaction with ID ${tid} was indexed as being in block ID ${bid}, but no such block was found", ("tid", transaction_id)("bid", block_id));
+      FC_THROW("Transaction with ID ${tid} was indexed as being in block ID ${bid}, but was not found in that block", ("tid", transaction_id)("bid", block_id));
    }
 
 #warning TODO: lookup of recent transactions