torrent.go | 10 ++++++++--

diff --git a/torrent.go b/torrent.go
index 4c2a476ebe1ec7f7452653f50a17b4d6ac813fe7..0585a5f1dd4835750d7d34d1128b8a3fd39c3939 100644
--- a/torrent.go
+++ b/torrent.go
@@ -124,7 +124,7 @@ func (t *torrent) HaveMetadataPiece(piece int) bool {
 	if t.haveInfo() {
 		return (1<<14)*piece < len(t.MetaData)
 	} else {
-		return t.metadataHave[piece]
+		return piece < len(t.metadataHave) && t.metadataHave[piece]
 	}
 }
 
@@ -252,7 +252,13 @@ }
 
 func (t *torrent) WriteStatus(w io.Writer) {
 	fmt.Fprintf(w, "Infohash: %x\n", t.InfoHash)
-	fmt.Fprintf(w, "Piece length: %d\n", t.UsualPieceSize())
+	fmt.Fprintf(w, "Piece length: %s\n", func() string {
+		if t.haveInfo() {
+			return fmt.Sprint(t.UsualPieceSize())
+		} else {
+			return "?"
+		}
+	}())
 	fmt.Fprint(w, "Pieces: ")
 	for index := range t.Pieces {
 		fmt.Fprintf(w, "%c", t.pieceStatusChar(index))