diff --git a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/FilesModel.groovy b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/FilesModel.groovy
index 6dc657a1..dc7b2788 100644
--- a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/FilesModel.groovy
+++ b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/FilesModel.groovy
@@ -53,7 +53,8 @@ class FilesModel {
     
     void onFileHashedEvent(FileHashedEvent e) {
         guiThread.invokeLater {
-            sharedFiles.add(e.sharedFile)
+            if (e.sharedFile != null)
+                sharedFiles.add(e.sharedFile)
         }
     }