diff --git a/lib/fog/rackspace/dns.rb b/lib/fog/rackspace/dns.rb
index 81b7757d9..ca9ba219d 100644
--- a/lib/fog/rackspace/dns.rb
+++ b/lib/fog/rackspace/dns.rb
@@ -4,6 +4,7 @@ require 'fog/dns'
 module Fog
   module DNS
     class Rackspace < Fog::Service
+      include Fog::Rackspace::Errors
 
       class CallbackError < Fog::Errors::Error
         attr_reader :response, :message, :details
@@ -118,7 +119,7 @@ module Fog
           rescue Excon::Errors::Conflict => error
             raise Fog::Rackspace::Errors::Conflict.slurp error
           rescue Excon::Errors::NotFound => error
-            raise Fog::Rackspace::Errors::NotFound.slurp error
+            raise NotFound.slurp(error, region)
           rescue Excon::Errors::ServiceUnavailable => error
             raise Fog::Rackspace::Errors::ServiceUnavailable.slurp error
           end
diff --git a/lib/fog/rackspace/models/dns/records.rb b/lib/fog/rackspace/models/dns/records.rb
index f41dc1962..5d37fba51 100644
--- a/lib/fog/rackspace/models/dns/records.rb
+++ b/lib/fog/rackspace/models/dns/records.rb
@@ -24,7 +24,7 @@ module Fog
         #nil or empty string will trigger an argument error
         rescue ArgumentError
           nil
-        rescue Fog::Rackspace::Errors::NotFound
+        rescue Fog::DNS::Rackspace::NotFound
           nil
         end
 
diff --git a/lib/fog/rackspace/models/dns/zones.rb b/lib/fog/rackspace/models/dns/zones.rb
index 9de234f25..c5fc76a7a 100644
--- a/lib/fog/rackspace/models/dns/zones.rb
+++ b/lib/fog/rackspace/models/dns/zones.rb
@@ -50,7 +50,7 @@ module Fog
 
           data = service.list_domain_details(zone_id).body
           new(data)
-        rescue Fog::Rackspace::Errors::NotFound
+        rescue Fog::DNS::Rackspace::NotFound
           nil
         #Accessing a valid (but other customer's) id returns a 503 error
         rescue Fog::Rackspace::Errors::ServiceUnavailable
diff --git a/tests/rackspace/requests/dns/dns_tests.rb b/tests/rackspace/requests/dns/dns_tests.rb
index 208961fd3..af8c59563 100644
--- a/tests/rackspace/requests/dns/dns_tests.rb
+++ b/tests/rackspace/requests/dns/dns_tests.rb
@@ -111,7 +111,7 @@ Shindo.tests('Fog::DNS[:rackspace] | DNS requests', ['rackspace', 'dns']) do
       Fog::DNS[:rackspace].list_domains :limit => 5, :offset => 8
     end
 
-    tests('list_domain_details 34335353').raises(Fog::Rackspace::Errors::NotFound) do
+    tests('list_domain_details 34335353').raises(Fog::DNS::Rackspace::NotFound) do
       Fog::DNS[:rackspace].list_domain_details 34335353
     end
 
diff --git a/tests/rackspace/requests/dns/records_tests.rb b/tests/rackspace/requests/dns/records_tests.rb
index ea9bb36d4..d066e312d 100644
--- a/tests/rackspace/requests/dns/records_tests.rb
+++ b/tests/rackspace/requests/dns/records_tests.rb
@@ -55,7 +55,7 @@ Shindo.tests('Fog::DNS[:rackspace] | dns records requests', ['rackspace', 'dns']
         Fog::DNS[:rackspace].list_records('')
       end
 
-      tests("list_records('abc')").raises(Fog::Rackspace::Errors::NotFound) do
+      tests("list_records('abc')").raises(Fog::DNS::Rackspace::NotFound) do
         Fog::DNS[:rackspace].list_records('abc')
       end
 
@@ -63,7 +63,7 @@ Shindo.tests('Fog::DNS[:rackspace] | dns records requests', ['rackspace', 'dns']
         Fog::DNS[:rackspace].list_record_details(@domain_id, '')
       end
 
-      tests("list_record_details(#{@domain_id}, 'abc')").raises(Fog::Rackspace::Errors::NotFound) do
+      tests("list_record_details(#{@domain_id}, 'abc')").raises(Fog::DNS::Rackspace::NotFound) do
         Fog::DNS[:rackspace].list_record_details(@domain_id, 'abc')
       end
 
@@ -71,7 +71,7 @@ Shindo.tests('Fog::DNS[:rackspace] | dns records requests', ['rackspace', 'dns']
         Fog::DNS[:rackspace].remove_record(@domain_id, '')
       end
 
-      tests("remove_record(#{@domain_id}, 'abc')").raises(Fog::Rackspace::Errors::NotFound) do
+      tests("remove_record(#{@domain_id}, 'abc')").raises(Fog::DNS::Rackspace::NotFound) do
         Fog::DNS[:rackspace].remove_record(@domain_id, 'abc')
       end