client_test.go                      | 3 ++-
 cmd/magnet-metainfo/main.go         | 2 +-
 cmd/torrent-magnet/main.go          | 6 +++++-
 cmd/torrent-metainfo-pprint/main.go | 6 +++++-
 cmd/torrent-verify/main.go          | 5 ++++-
 issue97_test.go                     | 3 ++-

diff --git a/client_test.go b/client_test.go
index e23f7250f24cbf2a23c7c73343e3c05a75c7d7a4..dbcd02f843e6ace6ea68c727cb85d0b2f68155b1 100644
--- a/client_test.go
+++ b/client_test.go
@@ -730,7 +730,8 @@ 	require.NoError(t, err)
 	greetingDataTempDir, greetingMetainfo := testutil.GreetingTestTorrent()
 	defer os.RemoveAll(greetingDataTempDir)
 	filePieceStore := csf(fileCache)
-	info := greetingMetainfo.UnmarshalInfo()
+	info, err := greetingMetainfo.UnmarshalInfo()
+	require.NoError(t, err)
 	ih := greetingMetainfo.HashInfoBytes()
 	greetingData, err := storage.NewClient(filePieceStore).OpenTorrent(&info, ih)
 	require.NoError(t, err)
diff --git a/cmd/magnet-metainfo/main.go b/cmd/magnet-metainfo/main.go
index f7b7dce0eedf18ec3a0d2550ec2581295eef0293..e231f1714a09cd2b6c8aa8df208765c813fe10a5 100644
--- a/cmd/magnet-metainfo/main.go
+++ b/cmd/magnet-metainfo/main.go
@@ -29,7 +29,7 @@ 			defer wg.Done()
 			<-t.GotInfo()
 			mi := t.Metainfo()
 			t.Drop()
-			f, err := os.Create(mi.UnmarshalInfo().Name + ".torrent")
+			f, err := os.Create(t.Info().Name + ".torrent")
 			if err != nil {
 				log.Fatalf("error creating torrent metainfo file: %s", err)
 			}
diff --git a/cmd/torrent-magnet/main.go b/cmd/torrent-magnet/main.go
index 50e57b16fbb52e6ffc757b7984ad41d4a2b6acfe..ee0ea2ec2b7b020eda6fd8ac67e12e9f2cd2ac06 100644
--- a/cmd/torrent-magnet/main.go
+++ b/cmd/torrent-magnet/main.go
@@ -17,7 +17,11 @@ 	if err != nil {
 		fmt.Fprintf(os.Stderr, "error reading metainfo from stdin: %s", err)
 		os.Exit(1)
 	}
-	info := mi.UnmarshalInfo()
+	info, err := mi.UnmarshalInfo()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "error unmarshalling info: %s", err)
+		os.Exit(1)
+	}
 
 	fmt.Fprintf(os.Stdout, "%s\n", mi.Magnet(info.Name, mi.HashInfoBytes()).String())
 }
diff --git a/cmd/torrent-metainfo-pprint/main.go b/cmd/torrent-metainfo-pprint/main.go
index 4f99a9974ab7ee996eba588debfe209877fba479..91e7c7aa1b63226c3fc0eaa725c97820daba9705 100644
--- a/cmd/torrent-metainfo-pprint/main.go
+++ b/cmd/torrent-metainfo-pprint/main.go
@@ -29,7 +29,11 @@ 		if err != nil {
 			log.Print(err)
 			continue
 		}
-		info := metainfo.UnmarshalInfo()
+		info, err := metainfo.UnmarshalInfo()
+		if err != nil {
+			log.Printf("error unmarshalling info: %s", err)
+			continue
+		}
 		if flags.JustName {
 			fmt.Printf("%s\n", info.Name)
 			continue
diff --git a/cmd/torrent-verify/main.go b/cmd/torrent-verify/main.go
index 7f329302b75f701ed608996ff26ea8edeebb9b4c..ba64d801dc97e2cf62c18e1af6ed831ef195b605 100644
--- a/cmd/torrent-verify/main.go
+++ b/cmd/torrent-verify/main.go
@@ -49,7 +49,10 @@ 	metaInfo, err := metainfo.LoadFromFile(*torrentPath)
 	if err != nil {
 		log.Fatal(err)
 	}
-	info := metaInfo.UnmarshalInfo()
+	info, err := metaInfo.UnmarshalInfo()
+	if err != nil {
+		log.Fatalf("error unmarshalling info: %s", err)
+	}
 	mMapSpan := &mmap_span.MMapSpan{}
 	if len(info.Files) > 0 {
 		for _, file := range info.Files {
diff --git a/issue97_test.go b/issue97_test.go
index 2695e5b70972698d070f8f9f06e418522b028490..5e1ab8f9f4d8486bf0bf9bf89f19f94379bd77de 100644
--- a/issue97_test.go
+++ b/issue97_test.go
@@ -18,7 +18,8 @@ 	defer os.RemoveAll(td)
 	cs := storage.NewClient(storage.NewFile(td))
 	tt := &Torrent{}
 	mi := testutil.GreetingMetaInfo()
-	info := mi.UnmarshalInfo()
+	info, err := mi.UnmarshalInfo()
+	require.NoError(t, err)
 	tt.info = &info
 	tt.makePieces()
 	tt.storage, err = cs.OpenTorrent(tt.info, mi.HashInfoBytes())