diff --git a/src/Databases/MySQL/MaterializeMySQLSettings.cpp b/src/Databases/MySQL/MaterializeMySQLSettings.cpp
index 609ce011f91..a8672bf488e 100644
--- a/src/Databases/MySQL/MaterializeMySQLSettings.cpp
+++ b/src/Databases/MySQL/MaterializeMySQLSettings.cpp
@@ -8,7 +8,6 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int BAD_ARGUMENTS;
     extern const int UNKNOWN_SETTING;
 }
 
@@ -25,9 +24,8 @@ void MaterializeMySQLSettings::loadFromQuery(ASTStorage & storage_def)
         catch (Exception & e)
         {
             if (e.code() == ErrorCodes::UNKNOWN_SETTING)
-                throw Exception(e.message() + " for database " + storage_def.engine->name, ErrorCodes::BAD_ARGUMENTS);
-            else
-                e.rethrow();
+                e.addMessage("for database " + storage_def.engine->name);
+            throw;
         }
     }
     else
diff --git a/src/Interpreters/ActionsVisitor.cpp b/src/Interpreters/ActionsVisitor.cpp
index 7572968c2c6..22c81d1d365 100644
--- a/src/Interpreters/ActionsVisitor.cpp
+++ b/src/Interpreters/ActionsVisitor.cpp
@@ -744,12 +744,12 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
     {
         function_builder = FunctionFactory::instance().get(node.name, data.context);
     }
-    catch (DB::Exception & e)
+    catch (Exception & e)
     {
         auto hints = AggregateFunctionFactory::instance().getHints(node.name);
         if (!hints.empty())
             e.addMessage("Or unknown aggregate function " + node.name + ". Maybe you meant: " + toString(hints));
-        e.rethrow();
+        throw;
     }
 
     Names argument_names;
diff --git a/src/Storages/JoinSettings.cpp b/src/Storages/JoinSettings.cpp
index 15637d67dea..8a2699746da 100644
--- a/src/Storages/JoinSettings.cpp
+++ b/src/Storages/JoinSettings.cpp
@@ -10,7 +10,6 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int BAD_ARGUMENTS;
     extern const int UNKNOWN_SETTING;
 }
 
@@ -27,9 +26,8 @@ void JoinSettings::loadFromQuery(ASTStorage & storage_def)
         catch (Exception & e)
         {
             if (e.code() == ErrorCodes::UNKNOWN_SETTING)
-                throw Exception(e.message() + " for storage " + storage_def.engine->name, ErrorCodes::BAD_ARGUMENTS);
-            else
-                e.rethrow();
+                e.addMessage("for storage " + storage_def.engine->name);
+            throw;
         }
     }
     else
diff --git a/src/Storages/Kafka/KafkaSettings.cpp b/src/Storages/Kafka/KafkaSettings.cpp
index 4d80419af2d..6ef74511d83 100644
--- a/src/Storages/Kafka/KafkaSettings.cpp
+++ b/src/Storages/Kafka/KafkaSettings.cpp
@@ -10,7 +10,6 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int BAD_ARGUMENTS;
     extern const int UNKNOWN_SETTING;
 }
 
@@ -27,9 +26,8 @@ void KafkaSettings::loadFromQuery(ASTStorage & storage_def)
         catch (Exception & e)
         {
             if (e.code() == ErrorCodes::UNKNOWN_SETTING)
-                throw Exception(e.message() + " for storage " + storage_def.engine->name, ErrorCodes::BAD_ARGUMENTS);
-            else
-                e.rethrow();
+                e.addMessage("for storage " + storage_def.engine->name);
+            throw;
         }
     }
     else
diff --git a/src/Storages/MergeTree/MergeTreeSettings.cpp b/src/Storages/MergeTree/MergeTreeSettings.cpp
index 00580c8d8bb..15ff62e0aa6 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.cpp
+++ b/src/Storages/MergeTree/MergeTreeSettings.cpp
@@ -11,9 +11,8 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int INVALID_CONFIG_PARAMETER;
-    extern const int BAD_ARGUMENTS;
     extern const int UNKNOWN_SETTING;
+    extern const int BAD_ARGUMENTS;
 }
 
 IMPLEMENT_SETTINGS_TRAITS(MergeTreeSettingsTraits, LIST_OF_MERGE_TREE_SETTINGS)
@@ -34,9 +33,8 @@ void MergeTreeSettings::loadFromConfig(const String & config_elem, const Poco::U
     catch (Exception & e)
     {
         if (e.code() == ErrorCodes::UNKNOWN_SETTING)
-            throw Exception(e.message() + " in MergeTree config", ErrorCodes::INVALID_CONFIG_PARAMETER);
-        else
-            e.rethrow();
+            e.addMessage("in MergeTree config");
+        throw;
     }
 }
 
@@ -51,9 +49,8 @@ void MergeTreeSettings::loadFromQuery(ASTStorage & storage_def)
         catch (Exception & e)
         {
             if (e.code() == ErrorCodes::UNKNOWN_SETTING)
-                throw Exception(e.message() + " for storage " + storage_def.engine->name, ErrorCodes::BAD_ARGUMENTS);
-            else
-                e.rethrow();
+                e.addMessage("for storage " + storage_def.engine->name);
+            throw;
         }
     }
     else
diff --git a/src/Storages/RabbitMQ/RabbitMQSettings.cpp b/src/Storages/RabbitMQ/RabbitMQSettings.cpp
index f956c520749..93495cdd8ae 100644
--- a/src/Storages/RabbitMQ/RabbitMQSettings.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQSettings.cpp
@@ -9,7 +9,6 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int BAD_ARGUMENTS;
     extern const int UNKNOWN_SETTING;
 }
 
@@ -26,9 +25,8 @@ void RabbitMQSettings::loadFromQuery(ASTStorage & storage_def)
         catch (Exception & e)
         {
             if (e.code() == ErrorCodes::UNKNOWN_SETTING)
-                throw Exception(e.message() + " for storage " + storage_def.engine->name, ErrorCodes::BAD_ARGUMENTS);
-            else
-                e.rethrow();
+                e.addMessage("for storage " + storage_def.engine->name);
+            throw;
         }
     }
     else
diff --git a/src/Storages/SetSettings.cpp b/src/Storages/SetSettings.cpp
index f7ff1c446f2..baa3d231067 100644
--- a/src/Storages/SetSettings.cpp
+++ b/src/Storages/SetSettings.cpp
@@ -10,7 +10,6 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int BAD_ARGUMENTS;
     extern const int UNKNOWN_SETTING;
 }
 
@@ -27,9 +26,8 @@ void SetSettings::loadFromQuery(ASTStorage & storage_def)
         catch (Exception & e)
         {
             if (e.code() == ErrorCodes::UNKNOWN_SETTING)
-                throw Exception(e.message() + " for storage " + storage_def.engine->name, ErrorCodes::BAD_ARGUMENTS);
-            else
-                e.rethrow();
+                e.addMessage("for storage " + storage_def.engine->name);
+            throw;
         }
     }
     else