diff --git a/lib/roast/cogs/agent/config.rb b/lib/roast/cogs/agent/config.rb
index 8160e0e6..51aa8112 100644
--- a/lib/roast/cogs/agent/config.rb
+++ b/lib/roast/cogs/agent/config.rb
@@ -51,7 +51,7 @@ def use_default_provider!
         def valid_provider!
           provider = @values[:provider] || VALID_PROVIDERS.first
           unless VALID_PROVIDERS.include?(provider)
-            raise ArgumentError, "'#{provider}' is not a valid provider. Available providers include: #{VALID_PROVIDERS.join(", ")}"
+            raise InvalidConfigError, "'#{provider}' is not a valid provider. Available providers include: #{VALID_PROVIDERS.join(", ")}"
           end
 
           provider
diff --git a/lib/roast/cogs/chat/config.rb b/lib/roast/cogs/chat/config.rb
index 93acc83a..62cc7caf 100644
--- a/lib/roast/cogs/chat/config.rb
+++ b/lib/roast/cogs/chat/config.rb
@@ -67,7 +67,7 @@ def use_default_provider!
         def valid_provider!
           provider = @values[:provider] || PROVIDERS.keys.first
           unless PROVIDERS.include?(provider)
-            raise ArgumentError, "'#{provider}' is not a valid provider. Available providers include: #{PROVIDERS.keys.join(", ")}"
+            raise InvalidConfigError, "'#{provider}' is not a valid provider. Available providers include: #{PROVIDERS.keys.join(", ")}"
           end
 
           provider
diff --git a/test/roast/cogs/agent/config_test.rb b/test/roast/cogs/agent/config_test.rb
index c0e31814..80c27762 100644
--- a/test/roast/cogs/agent/config_test.rb
+++ b/test/roast/cogs/agent/config_test.rb
@@ -31,7 +31,7 @@ def setup
       test "valid_provider! raises on invalid provider" do
         @config.provider(:invalid_provider)
 
-        error = assert_raises(ArgumentError) do
+        error = assert_raises(Cog::Config::InvalidConfigError) do
           @config.valid_provider!
         end
 
diff --git a/test/roast/cogs/chat/config_test.rb b/test/roast/cogs/chat/config_test.rb
index 2445a5ac..68137d04 100644
--- a/test/roast/cogs/chat/config_test.rb
+++ b/test/roast/cogs/chat/config_test.rb
@@ -50,7 +50,7 @@ def setup
       test "valid_provider! raises on invalid provider" do
         @config.provider(:invalid_provider)
 
-        error = assert_raises(ArgumentError) do
+        error = assert_raises(Cog::Config::InvalidConfigError) do
           @config.valid_provider!
         end