diff --git a/lib/rubber/dns/fog.rb b/lib/rubber/dns/fog.rb
index a9f74f335..5aef47acf 100644
--- a/lib/rubber/dns/fog.rb
+++ b/lib/rubber/dns/fog.rb
@@ -60,7 +60,7 @@ def find_hosts(opts = {})
           fqdn << "#{opts[:domain]}"
         end
 
-        hosts = fqdn ? zone.records.find(fqdn) : zone.records.all
+        hosts = fqdn ? (zone.records.find(fqdn) rescue []) : zone.records.all
         hosts.each do |h|
           keep = true
 
diff --git a/lib/rubber/dns/zerigo.rb b/lib/rubber/dns/zerigo.rb
index a2e236278..17401b04d 100644
--- a/lib/rubber/dns/zerigo.rb
+++ b/lib/rubber/dns/zerigo.rb
@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'fog'
+require 'rubber/dns/fog'
 
 module Rubber
   module Dns
@@ -7,14 +8,10 @@ module Dns
     class Zerigo < Fog
 
       def initialize(env)
-        super(env)
-
-        @client = Fog::DNS.new({
-            :provider     => 'zerigo',
-            :zerigo_email => provider_env.email,
-            :zerigo_token => provider_env.token
-          })
+        super(env.merge({"credentials" => { "provider" => 'zerigo', "zerigo_email" => env.email, "zerigo_token" => env.token }}))
       end
-
+    
+    end
+    
   end
 end