diff --git a/irdb-libs/ir_builders/fill_in_indtargs.cpp b/irdb-libs/ir_builders/fill_in_indtargs.cpp
index 9ca7a323b16da1fbceab81419aae457b923c76a3..a80f436d80f90f1bec56d260700af096cd7facd5 100644
--- a/irdb-libs/ir_builders/fill_in_indtargs.cpp
+++ b/irdb-libs/ir_builders/fill_in_indtargs.cpp
@@ -2534,7 +2534,7 @@ V2:
 			found_leas.insert(I5);
 
 		// if we didn't find anything yet, ....
-		if (found_leas.size() == 0 && I6->getFunction())
+		if (found_leas.empty() && I6->getFunction())
 		{
 			cout << "Using find_in_function method." << endl;
 			const auto tmp_found_leas = find_in_function("lea ", I6->getFunction());
@@ -2950,7 +2950,7 @@ V2:
 				table_entry_size == 1 ? VirtualOffset_t(*reinterpret_cast<const int8_t *>(table_entry_ptr)) : table_entry_size == 2 ? VirtualOffset_t(*reinterpret_cast<const int16_t *>(table_entry_ptr))
 																										  : table_entry_size == 4	? VirtualOffset_t(*reinterpret_cast<const int32_t *>(table_entry_ptr))
 																										  : table_entry_size == 8	? VirtualOffset_t(*reinterpret_cast<const int64_t *>(table_entry_ptr))
-																																	: throw new invalid_argument("Cannot detect displacement size to load value ");
+																																	: throw invalid_argument("Cannot detect displacement size to load value ");
 			const auto table_entry = raw_table_entry * table_entry_multiplier;
 
 			if (!possible_target(D1 + table_entry, 0 /* from addr unknown */, switch_prov))