2 files changed, 6 insertions, 0 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 35f2919918..da5c344354 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -638,6 +638,8 @@ module Bundler
       specs = begin
         resolve.materialize(dependencies)
       rescue IncorrectLockfileDependencies => e
+        raise if Bundler.frozen_bundle?
+
         spec = e.spec
         raise "Infinite loop while fixing lockfile dependencies" if incorrect_spec == spec
 
diff --git a/lib/bundler/errors.rb b/lib/bundler/errors.rb
index 3fa90c5eb8..9d3d89ffeb 100644
--- a/lib/bundler/errors.rb
+++ b/lib/bundler/errors.rb
@@ -254,6 +254,10 @@ module Bundler
       @spec = spec
     end
 
+    def message
+      "Bundler found incorrect dependencies in the lockfile for #{spec.full_name}"
+    end
+
     status_code(41)
   end
 end