diff --git a/src/server/settings/viewed.go b/src/server/settings/viewed.go
index bcf707e..bfdfb18 100644
--- a/src/server/settings/viewed.go
+++ b/src/server/settings/viewed.go
@@ -58,6 +58,9 @@ func ListViewed(hash string) []*Viewed {
 	var err error
 	if hash != "" {
 		buf := tdb.Get("Viewed", hash)
+		if len(buf) == 0 {
+			return []*Viewed{}
+		}
 		var indeces map[int]struct{}
 		err = json.Unmarshal(buf, &indeces)
 		if err == nil {
@@ -72,6 +75,9 @@ func ListViewed(hash string) []*Viewed {
 		keys := tdb.List("Viewed")
 		for _, key := range keys {
 			buf := tdb.Get("Viewed", key)
+			if len(buf) == 0 {
+				return []*Viewed{}
+			}
 			var indeces map[int]struct{}
 			err = json.Unmarshal(buf, &indeces)
 			if err == nil {
@@ -86,5 +92,5 @@ func ListViewed(hash string) []*Viewed {
 	if err != nil {
 		log.TLogln("Error list viewed:", err)
 	}
-	return nil
+	return []*Viewed{}
 }
diff --git a/src/server/torr/apihelper.go b/src/server/torr/apihelper.go
index edcfaef..f8d0f47 100644
--- a/src/server/torr/apihelper.go
+++ b/src/server/torr/apihelper.go
@@ -62,13 +62,12 @@ func GetTorrent(hashHex string) *Torrent {
 
 	tor = GetTorrentDB(hash)
 
-	tr, err := NewTorrent(tor.TorrentSpec, bts)
-	if err != nil {
-		log.TLogln("error get torrent db:", err)
-	}
-	if tr != nil {
-		go tr.GotInfo()
-	}
+	go func() {
+		tr, _ := NewTorrent(tor.TorrentSpec, bts)
+		if tr != nil {
+			tr.GotInfo()
+		}
+	}()
 	return tor
 }