0
@@ -26,8 +26,8 @@ module Waves
0
       end
0
 
0
       def delete(*keys)
0
-        keys.each do |key|
0
-          Waves.synchronize do
0
+        Waves.synchronize do
0
+          keys.each do |key|
0
             if @keys.include? key
0
               ::File.delete(@directory / key)
0
               @keys.delete key
0
@@ -48,13 +48,16 @@ module Waves
0
       def fetch(key)
0
         Waves.synchronize do
0
 
0
-          raise KeyMissing unless item = ::Marshal.load(::File.new(@directory / key))
0
+          item = ::Marshal.load(::File.new(@directory / key))
0
 
0
           if item[:expires] and item[:expires] < Time.now
0
-            (::File.delete(@directory / key) and @keys.delete key) and raise KeyExpired
0
+            ::File.delete(@directory / key)
0
+            @keys.delete key and raise KeyExpired
0
           end
0
           item[:value]
0
         end
0
+      rescue Errno::ENOENT
0
+        raise KeyMissing
0
       end
0
 
0
     end