diff --git a/core/src/main/java/com/muwire/core/InfoHash.java b/core/src/main/java/com/muwire/core/InfoHash.java
index ae4cc690..df01372f 100644
--- a/core/src/main/java/com/muwire/core/InfoHash.java
+++ b/core/src/main/java/com/muwire/core/InfoHash.java
@@ -77,13 +77,15 @@ public class InfoHash {
 	
 	public String toString() {
 		String rv = "InfoHash[root:"+Base32.encode(root) + " hashList:";
-		List<String> b32HashList = new ArrayList<>(hashList.length / SIZE);
-		byte [] tmp = new byte[SIZE];
-		for (int i = 0; i < hashList.length / SIZE; i++) {
-			System.arraycopy(hashList, SIZE * i, tmp, 0, SIZE);
-			b32HashList.add(Base32.encode(tmp));
+		List<String> b64HashList = new ArrayList<>();
+		if (hashList != null) {       
+		    byte [] tmp = new byte[SIZE];
+		    for (int i = 0; i < hashList.length / SIZE; i++) {
+		        System.arraycopy(hashList, SIZE * i, tmp, 0, SIZE);
+		        b64HashList.add(Base32.encode(tmp));
+		    }
 		}
-		rv += b32HashList.toString();
+		rv += b64HashList.toString();
 		rv += "]";
 		return rv;
 	}