use storage.db_open instead of flock directly
Robustness fixes