diff --git a/src/dodb.cr b/src/dodb.cr
index 74e321d..abe2f6d 100644
--- a/src/dodb.cr
+++ b/src/dodb.cr
@@ -61,6 +61,10 @@ abstract class DODB::Storage(V)
 		release_lock "index"
 
 		index # FIXME: Should we really return the internal key?
+	rescue e
+		release_lock "index"
+
+		raise e
 	end
 
 	def each(reversed : Bool = false, start_offset = 0, end_offset : Int32? = nil)