diff --git a/webui/src/main/java/com/muwire/webui/FileManager.java b/webui/src/main/java/com/muwire/webui/FileManager.java
index 3e11b8ac..d5a26208 100644
--- a/webui/src/main/java/com/muwire/webui/FileManager.java
+++ b/webui/src/main/java/com/muwire/webui/FileManager.java
@@ -44,6 +44,8 @@ public class FileManager {
     
     public void onFileHashedEvent(FileHashedEvent e) {
         hashingFile = null;
+        if (e.getSharedFile() == null) // TODO: think of something better
+            return;
         fileTree.add(e.getSharedFile().getFile(), e.getSharedFile());
         revision++;
     }