diff --git a/server/torr/apihelper.go b/server/torr/apihelper.go
index 272f654..93d9ee2 100644
--- a/server/torr/apihelper.go
+++ b/server/torr/apihelper.go
@@ -196,12 +196,12 @@ func SetSettings(set *sets.BTSets) {
 	sets.SetBTSets(set)
 	log.TLogln("drop all torrents")
 	dropAllTorrent()
-	time.Sleep(time.Second * 2)
+	time.Sleep(time.Second * 1)
 	log.TLogln("disconect")
 	bts.Disconnect()
 	log.TLogln("connect")
 	bts.Connect()
-	time.Sleep(time.Second * 2)
+	time.Sleep(time.Second * 1)
 	log.TLogln("end set settings")
 }
 
@@ -212,12 +212,12 @@ func SetDefSettings() {
 	sets.SetDefault()
 	log.TLogln("drop all torrents")
 	dropAllTorrent()
-	time.Sleep(time.Second * 2)
+	time.Sleep(time.Second * 1)
 	log.TLogln("disconect")
 	bts.Disconnect()
 	log.TLogln("connect")
 	bts.Connect()
-	time.Sleep(time.Second * 2)
+	time.Sleep(time.Second * 1)
 	log.TLogln("end set default settings")
 }
 
diff --git a/server/torr/torrent.go b/server/torr/torrent.go
index 535eaa1..7be01c4 100644
--- a/server/torr/torrent.go
+++ b/server/torr/torrent.go
@@ -50,8 +50,8 @@ type Torrent struct {
 }
 
 func NewTorrent(spec *torrent.TorrentSpec, bt *BTServer) (*Torrent, error) {
-	// TODO panic when settings sets
-	if bt == nil {
+	// https://github.com/anacrolix/torrent/issues/747
+	if bt == nil || bt.client == nil {
 		return nil, errors.New("BT client not connected")
 	}
 	switch settings.BTsets.RetrackersMode {