diff --git a/lib/puppet/ssl/oids.rb b/lib/puppet/ssl/oids.rb
index 5bc335774..2ca533f8c 100644
--- a/lib/puppet/ssl/oids.rb
+++ b/lib/puppet/ssl/oids.rb
@@ -1,129 +1,129 @@
 require 'puppet/ssl'
 
 # This module defines OIDs for use within Puppet.
 #
 # == ASN.1 Definition
 #
 # The following is the formal definition of OIDs specified in this file.
 #
 # puppetCertExtensions OBJECT IDENTIFIER ::= {iso(1) identified-organization(3)
 #    dod(6) internet(1) private(4) enterprise(1) 34380 1}
 #
 # -- the tree under registeredExtensions 'belongs' to puppetlabs
 # -- privateExtensions can be extended by enterprises to suit their own needs
 # registeredExtensions OBJECT IDENTIFIER ::= { puppetCertExtensions 1 }
 # privateExtensions OBJECT IDENTIFIER ::= { puppetCertExtensions 2 }
 #
 # -- subtree of common registered extensions
 # -- The short names for these OIDs are intentionally lowercased and formatted
 # -- since they may be exposed inside the Puppet DSL as variables.
 # pp_uuid  OBJECT IDENTIFIER ::= { registeredExtensions 1 }
 # pp_instance_id OBJECT IDENTIFIER ::= { registeredExtensions 2 }
 # pp_image_name OBJECT IDENTIFIER ::= { registeredExtensions 3 }
 # pp_preshared_key OBJECT IDENTIFIER ::= { registeredExtensions 4 }
 #
 # @api private
 module Puppet::SSL::Oids
 
   PUPPET_OIDS = [
     ["1.3.6.1.4.1.34380", 'puppetlabs', 'Puppet Labs'],
     ["1.3.6.1.4.1.34380.1", 'ppCertExt', 'Puppet Certificate Extension'],
 
     ["1.3.6.1.4.1.34380.1.1", 'ppRegCertExt', 'Puppet Registered Certificate Extension'],
 
     ["1.3.6.1.4.1.34380.1.1.1", 'pp_uuid', 'Puppet Node UUID'],
     ["1.3.6.1.4.1.34380.1.1.2", 'pp_instance_id', 'Puppet Node Instance ID'],
     ["1.3.6.1.4.1.34380.1.1.3", 'pp_image_name', 'Puppet Node Image Name'],
     ["1.3.6.1.4.1.34380.1.1.4", 'pp_preshared_key', 'Puppet Node Preshared Key'],
 
     ["1.3.6.1.4.1.34380.1.2", 'ppPrivCertExt', 'Puppet Private Certificate Extension'],
   ]
 
   PUPPET_OIDS.each do |oid_defn|
     OpenSSL::ASN1::ObjectId.register(*oid_defn)
   end
 
   # Parse and load custom OID mapping file that enables custom OIDs to be resolved
   # into user-friendly names.
   #
   # @param custom_oid_file [String] File to obtain custom OIDs mapping from
   # @param map_key [String] Hash key in which custom OIDs mapping is stored
   #
   # @example Custom OID mapping file
   # ---
   # oid_mapping:
   #  '1.3.6.1.4.1.34380.1.2.1.1':
   #    shortname : 'myshortname'
   #    longname  : 'Long name'
   #  '1.3.6.1.4.1.34380.1.2.1.2':
   #    shortname: 'myothershortname'
   #    longname: 'Other Long name'
   def self.load_custom_oid_file(custom_oid_file, map_key='oid_mapping')
     if File.exists?(custom_oid_file) && File.readable?(custom_oid_file)
       mapping = nil
       begin
         mapping = YAML.load_file(custom_oid_file)
       rescue => err
-        raise ParseError, "Error loading ssl custom OIDs mapping file from '#{custom_oid_file}': #{err}", err.backtrace
+        raise Puppet::Error, "Error loading ssl custom OIDs mapping file from '#{custom_oid_file}': #{err}", err.backtrace
       end
 
       unless mapping.has_key?(map_key)
-        raise ParseError, "Error loading ssl custom OIDs mapping file from '#{custom_oid_file}': no such index '#{map_key}'"
+        raise Puppet::Error, "Error loading ssl custom OIDs mapping file from '#{custom_oid_file}': no such index '#{map_key}'"
       end
 
       unless mapping[map_key].is_a?(Hash)
-        raise ParseError, "Error loading ssl custom OIDs mapping file from '#{custom_oid_file}': data under index '#{map_key}' must be a Hash"
+        raise Puppet::Error, "Error loading ssl custom OIDs mapping file from '#{custom_oid_file}': data under index '#{map_key}' must be a Hash"
       end
 
       oid_defns = []
       mapping[map_key].keys.each do |oid|
         shortname, longname = mapping[map_key][oid].values_at("shortname","longname")
         if shortname.nil? || longname.nil?
-          raise ParseError, "Error loading ssl custom OIDs mapping file from '#{custom_oid_file}': incomplete definition of oid '#{oid}'"
+          raise Puppet::Error, "Error loading ssl custom OIDs mapping file from '#{custom_oid_file}': incomplete definition of oid '#{oid}'"
         end
         oid_defns << [oid, shortname, longname]
       end
 
       begin
         oid_defns.each do |oid_defn|
           OpenSSL::ASN1::ObjectId.register(*oid_defn)
         end
       rescue => err
         raise ArgumentError, "Error registering ssl custom OIDs mapping from file '#{custom_oid_file}': #{err}", err.backtrace
       end
     end
   end
 
   # Determine if the first OID contains the second OID
   #
   # @param first [String] The containing OID, in dotted form or as the short name
   # @param second [String] The contained OID, in dotted form or as the short name
   # @param exclusive [true, false] If an OID should not be considered as a subtree of itself
   #
   # @example Comparing two dotted OIDs
   #   Puppet::SSL::Oids.subtree_of?('1.3.6.1', '1.3.6.1.4.1') #=> true
   #   Puppet::SSL::Oids.subtree_of?('1.3.6.1', '1.3.6') #=> false
   #
   # @example Comparing an OID short name with a dotted OID
   #   Puppet::SSL::Oids.subtree_of?('IANA', '1.3.6.1.4.1') #=> true
   #   Puppet::SSL::Oids.subtree_of?('1.3.6.1', 'enterprises') #=> true
   #
   # @example Comparing an OID against itself
   #   Puppet::SSL::Oids.subtree_of?('IANA', 'IANA') #=> true
   #   Puppet::SSL::Oids.subtree_of?('IANA', 'IANA', true) #=> false
   #
   # @return [true, false]
   def self.subtree_of?(first, second, exclusive = false)
     first_oid = OpenSSL::ASN1::ObjectId.new(first).oid
     second_oid = OpenSSL::ASN1::ObjectId.new(second).oid
 
 
     if exclusive and first_oid == second_oid
       false
     else
       second_oid.index(first_oid) == 0
     end
   rescue OpenSSL::ASN1::ASN1Error
     false
   end
 end