diff --git a/lib/puppet/file_serving/configuration/parser.rb b/lib/puppet/file_serving/configuration/parser.rb
index ccb6b3568..2ae8313b1 100644
--- a/lib/puppet/file_serving/configuration/parser.rb
+++ b/lib/puppet/file_serving/configuration/parser.rb
@@ -1,121 +1,121 @@
 require 'puppet/file_serving/configuration'
 require 'puppet/util/watched_file'
 
 class Puppet::FileServing::Configuration::Parser
   Mount = Puppet::FileServing::Mount
   MODULES = 'modules'
 
   # Parse our configuration file.
   def parse
     raise("File server configuration #{@file} does not exist") unless Puppet::FileSystem.exist?(@file)
     raise("Cannot read file server configuration #{@file}") unless FileTest.readable?(@file)
 
     @mounts = {}
     @count = 0
 
     File.open(@file) { |f|
       mount = nil
       f.each_line { |line|
         # Have the count increment at the top, in case we throw exceptions.
         @count += 1
 
         case line
         when /^\s*#/; next # skip comments
         when /^\s*$/; next # skip blank lines
         when /\[([-\w]+)\]/
           mount = newmount($1)
         when /^\s*(\w+)\s+(.+?)(\s*#.*)?$/
           var = $1
           value = $2
           value.strip!
           raise(ArgumentError, "Fileserver configuration file does not use '=' as a separator") if value =~ /^=/
           case var
           when "path"
             path(mount, value)
           when "allow"
             allow(mount, value)
           when "deny"
             deny(mount, value)
           else
             raise ArgumentError.new("Invalid argument '#{var}' in #{@file.filename}, line #{@count}")
           end
         else
           raise ArgumentError.new("Invalid line '#{line.chomp}' at #{@file.filename}, line #{@count}")
         end
       }
     }
 
     validate
 
     @mounts
   end
 
   def initialize(filename)
     @file = Puppet::Util::WatchedFile.new(filename)
   end
 
   def changed?
     @file.changed?
   end
 
   private
 
   # Allow a given pattern access to a mount.
   def allow(mount, value)
     value.split(/\s*,\s*/).each { |val|
       begin
         mount.info "allowing #{val} access"
         mount.allow(val)
       rescue Puppet::AuthStoreError => detail
-        raise ArgumentError.new(detail.to_s, @count, @file)
+        raise ArgumentError.new("#{detail.to_s} in #{@file}, line #{@count}")
       end
     }
   end
 
   # Deny a given pattern access to a mount.
   def deny(mount, value)
     value.split(/\s*,\s*/).each { |val|
       begin
         mount.info "denying #{val} access"
         mount.deny(val)
       rescue Puppet::AuthStoreError => detail
-        raise ArgumentError.new(detail.to_s, @count, @file)
+        raise ArgumentError.new("#{detail.to_s} in #{@file}, line #{@count}")
       end
     }
   end
 
   # Create a new mount.
   def newmount(name)
-    raise ArgumentError, "#{@mounts[name]} is already mounted at #{name}", @count, @file if @mounts.include?(name)
+    raise ArgumentError.new("#{@mounts[name]} is already mounted at #{name} in #{@file}, line #{@count}") if @mounts.include?(name)
     case name
     when "modules"
       mount = Mount::Modules.new(name)
     when "plugins"
       mount = Mount::Plugins.new(name)
     else
       mount = Mount::File.new(name)
     end
     @mounts[name] = mount
     mount
   end
 
   # Set the path for a mount.
   def path(mount, value)
     if mount.respond_to?(:path=)
       begin
         mount.path = value
       rescue ArgumentError => detail
         Puppet.log_exception(detail, "Removing mount \"#{mount.name}\": #{detail}")
         @mounts.delete(mount.name)
       end
     else
       Puppet.warning "The '#{mount.name}' module can not have a path. Ignoring attempt to set it"
     end
   end
 
   # Make sure all of our mounts are valid.  We have to do this after the fact
   # because details are added over time as the file is parsed.
   def validate
     @mounts.each { |name, mount| mount.validate }
   end
 end