Prevent double wrapping directories in MockDirectoryWrapper
Use Store#tryIncRef when running check index
add catch bock back that got lost during merge