diff --git a/lib/puppet/indirector/catalog/active_record.rb b/lib/puppet/indirector/catalog/active_record.rb
index ad2dc742b..66348f9a4 100644
--- a/lib/puppet/indirector/catalog/active_record.rb
+++ b/lib/puppet/indirector/catalog/active_record.rb
@@ -1,34 +1,36 @@
 require 'puppet/rails/host'
 require 'puppet/indirector/active_record'
 require 'puppet/resource/catalog'
 
 class Puppet::Resource::Catalog::ActiveRecord < Puppet::Indirector::ActiveRecord
     use_ar_model Puppet::Rails::Host
 
     # If we can find the host, then return a catalog with the host's resources
     # as the vertices.
     def find(request)
         return nil unless request.options[:cache_integration_hack]
         return nil unless host = ar_model.find_by_name(request.key)
 
         catalog = Puppet::Resource::Catalog.new(host.name)
         
         host.resources.each do |resource|
             catalog.add_resource resource.to_transportable
         end
 
         catalog
     end
 
     # Save the values from a Facts instance as the facts on a Rails Host instance.
     def save(request)
         catalog = request.instance
 
         host = ar_model.find_by_name(catalog.name) || ar_model.create(:name => catalog.name)
 
-        host.merge_resources(catalog.vertices)
-        host.last_compile = Time.now
+        host.railsmark "Saved catalog to database" do
+            host.merge_resources(catalog.vertices)
+            host.last_compile = Time.now
 
-        host.save
+            host.save
+        end
     end
 end
diff --git a/spec/unit/indirector/catalog/active_record.rb b/spec/unit/indirector/catalog/active_record.rb
index cf7484110..2b5395a36 100755
--- a/spec/unit/indirector/catalog/active_record.rb
+++ b/spec/unit/indirector/catalog/active_record.rb
@@ -1,120 +1,122 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
 require 'puppet/indirector/catalog/active_record'
 
 describe Puppet::Resource::Catalog::ActiveRecord do
     confine "Missing Rails" => Puppet.features.rails?
 
     before do
         Puppet.features.stubs(:rails?).returns true
         Puppet::Rails.stubs(:init)
         @terminus = Puppet::Resource::Catalog::ActiveRecord.new
     end
 
     it "should be a subclass of the ActiveRecord terminus class" do
         Puppet::Resource::Catalog::ActiveRecord.ancestors.should be_include(Puppet::Indirector::ActiveRecord)
     end
 
     it "should use Puppet::Rails::Host as its ActiveRecord model" do
         Puppet::Resource::Catalog::ActiveRecord.ar_model.should equal(Puppet::Rails::Host)
     end
 
     describe "when finding an instance" do
         before do
             @request = stub 'request', :key => "foo", :options => {:cache_integration_hack => true}
         end
 
         # This hack is here because we don't want to look in the db unless we actually want
         # to look in the db, but our indirection architecture in 0.24.x isn't flexible
         # enough to tune that via configuration.
         it "should return nil unless ':cache_integration_hack' is set to true" do
             @request.options[:cache_integration_hack] = false
             Puppet::Rails::Host.expects(:find_by_name).never
             @terminus.find(@request).should be_nil
         end
 
         it "should use the Hosts ActiveRecord class to find the host" do
             Puppet::Rails::Host.expects(:find_by_name).with { |key, args| key == "foo" }
             @terminus.find(@request)
         end
 
         it "should return nil if no host instance can be found" do
             Puppet::Rails::Host.expects(:find_by_name).returns nil
 
             @terminus.find(@request).should be_nil
         end
 
         it "should return a catalog with the same name as the host if the host can be found" do
             host = stub 'host', :name => "foo", :resources => []
             Puppet::Rails::Host.expects(:find_by_name).returns host
 
             result = @terminus.find(@request)
             result.should be_instance_of(Puppet::Resource::Catalog)
             result.name.should == "foo"
         end
         
         it "should set each of the host's resources as a transportable resource within the catalog" do
             host = stub 'host', :name => "foo"
             Puppet::Rails::Host.expects(:find_by_name).returns host
 
             res1 = mock 'res1', :to_transportable => "trans_res1"
             res2 = mock 'res2', :to_transportable => "trans_res2"
 
             host.expects(:resources).returns [res1, res2]
 
             catalog = stub 'catalog'
             Puppet::Resource::Catalog.expects(:new).returns catalog
 
             catalog.expects(:add_resource).with "trans_res1"
             catalog.expects(:add_resource).with "trans_res2"
 
             @terminus.find(@request)
         end
     end
 
     describe "when saving an instance" do
         before do
             @host = stub 'host', :name => "foo", :save => nil, :merge_resources => nil, :last_compile= => nil
+            @host.stubs(:railsmark).yields
+
             Puppet::Rails::Host.stubs(:find_by_name).returns @host
             @catalog = Puppet::Resource::Catalog.new("foo")
             @request = stub 'request', :key => "foo", :instance => @catalog
         end
 
         it "should find the Rails host with the same name" do
             Puppet::Rails::Host.expects(:find_by_name).with("foo").returns @host
 
             @terminus.save(@request)
         end
 
         it "should create a new Rails host if none can be found" do
             Puppet::Rails::Host.expects(:find_by_name).with("foo").returns nil
 
             Puppet::Rails::Host.expects(:create).with(:name => "foo").returns @host
 
             @terminus.save(@request)
         end
 
         it "should set the catalog vertices as resources on the Rails host instance" do
             @catalog.expects(:vertices).returns "foo"
             @host.expects(:merge_resources).with("foo")
 
             @terminus.save(@request)
         end
 
         it "should set the last compile time on the host" do
             now = Time.now
             Time.expects(:now).returns now
             @host.expects(:last_compile=).with now
 
             @terminus.save(@request)
         end
 
         it "should save the Rails host instance" do
             @host.expects(:save)
 
             @terminus.save(@request)
         end
     end
 end