diff --git a/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy b/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
index 0f35beb0..7db068ed 100644
--- a/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
+++ b/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
@@ -638,7 +638,8 @@ class MainFrameModel {
                 if (e.first) {
                     Set<SharedFile> sfs = core.fileManager.getSharedFiles(e.uploader.infoHash.getRoot())
                     sfs.stream().map({sharedFileIdx[it]}).
-                        forEach{view.refreshSharedFilesTableRow(it)}
+                            filter({it != null}).
+                            forEach{view.refreshSharedFilesTableRow(it)}
                 }
             }
         }