diff --git a/lib/fog/compute/models/libvirt/server.rb b/lib/fog/compute/models/libvirt/server.rb
index eefc8ff44..0e97e8a2b 100644
--- a/lib/fog/compute/models/libvirt/server.rb
+++ b/lib/fog/compute/models/libvirt/server.rb
@@ -15,7 +15,6 @@ module Fog
         include Fog::Compute::LibvirtUtil
 
         identity :id, :aliases => 'uuid'
-        attribute :uuid
         attribute :xml
 
         attribute :cpus
diff --git a/lib/fog/compute/models/libvirt/servers.rb b/lib/fog/compute/models/libvirt/servers.rb
index d617c4a87..029650603 100644
--- a/lib/fog/compute/models/libvirt/servers.rb
+++ b/lib/fog/compute/models/libvirt/servers.rb
@@ -11,7 +11,7 @@ module Fog
 
         def all(filter=nil)
           data=[]
-
+          filter={} if filter.nil?
           include_defined=filter.has_key?(:defined) ? filter[:defined] : true  
           include_active=filter.has_key?(:active) ? filter[:active] : true