diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 46a923161c..130f5b0892 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -18,7 +18,7 @@ module Ci
       initial_parsing
 
       validate!
-    rescue Gitlab::Ci::Config::LoaderError => e
+    rescue Gitlab::Ci::Config::Loader::FormatError => e
       raise ValidationError, e.message
     end
 
diff --git a/lib/gitlab/ci/config.rb b/lib/gitlab/ci/config.rb
index 5fc4894311..b6ce791c0f 100644
--- a/lib/gitlab/ci/config.rb
+++ b/lib/gitlab/ci/config.rb
@@ -5,11 +5,6 @@ module Gitlab
 
       def initialize(config)
         loader = Loader.new(config)
-
-        unless loader.valid?
-          raise LoaderError, 'Invalid configuration format!'
-        end
-
         @config = loader.load
       end
 
diff --git a/spec/lib/gitlab/ci/config_spec.rb b/spec/lib/gitlab/ci/config_spec.rb
index 52aafbcaaa..4d46abe520 100644
--- a/spec/lib/gitlab/ci/config_spec.rb
+++ b/spec/lib/gitlab/ci/config_spec.rb
@@ -37,7 +37,8 @@ describe Gitlab::Ci::Config do
       describe '.new' do
         it 'raises error' do
           expect { config }.to raise_error(
-            Gitlab::Ci::Config::LoaderError, /Invalid configuration format/
+            Gitlab::Ci::Config::Loader::FormatError,
+            /Invalid configuration format/
           )
         end
       end