torrent.go | 6 ++++++

diff --git a/torrent.go b/torrent.go
index 365c9f86bd3f15c827efa73a1a59aa20a451a164..8f93281c05614943e441948e0f108df8ad685e96 100644
--- a/torrent.go
+++ b/torrent.go
@@ -64,6 +64,8 @@ 	// The storage to open when the info dict becomes available.
 	storageOpener *storage.Client
 	// Storage for torrent data.
 	storage *storage.Torrent
+	// Read-locked for using storage, and write-locked for Closing.
+	storageLock sync.RWMutex
 
 	metainfo metainfo.MetaInfo
 
@@ -611,7 +613,9 @@
 func (t *Torrent) close() (err error) {
 	t.closed.Set()
 	if t.storage != nil {
+		t.storageLock.Lock()
 		t.storage.Close()
+		t.storageLock.Unlock()
 	}
 	for conn := range t.conns {
 		conn.Close()
@@ -1547,8 +1551,10 @@ 		return
 	}
 	p.hashing = true
 	t.publishPieceChange(piece)
+	t.storageLock.RLock()
 	cl.mu.Unlock()
 	sum := t.hashPiece(piece)
+	t.storageLock.RUnlock()
 	cl.mu.Lock()
 	p.hashing = false
 	t.pieceHashed(piece, sum == p.hash)