diff --git a/webui/src/main/java/com/muwire/webui/UploadManager.java b/webui/src/main/java/com/muwire/webui/UploadManager.java
index 1984f535..e7692304 100644
--- a/webui/src/main/java/com/muwire/webui/UploadManager.java
+++ b/webui/src/main/java/com/muwire/webui/UploadManager.java
@@ -49,13 +49,14 @@ public class UploadManager {
         UploaderWrapper wrapper = null;
         synchronized(uploads) {
             for(UploaderWrapper uw : uploads) {
-                if (uw.uploader == e.getUploader()) {
+                if (uw.uploader.equals(e.getUploader())) {
                     wrapper = uw;
                     break;
                 }
             }
         }
-        wrapper.finished = true;
+        if (wrapper != null)
+            wrapper.finished = true;
     }
     
     public void clearFinished() {