diff --git a/core/src/main/groovy/com/muwire/core/collections/CollectionsClient.groovy b/core/src/main/groovy/com/muwire/core/collections/CollectionsClient.groovy
index 26109018..8c8fd841 100644
--- a/core/src/main/groovy/com/muwire/core/collections/CollectionsClient.groovy
+++ b/core/src/main/groovy/com/muwire/core/collections/CollectionsClient.groovy
@@ -55,6 +55,10 @@ class CollectionsClient {
                 
                 InputStream is = endpoint.getInputStream()
                 String code = DataUtil.readTillRN(is)
+                if (code.startsWith("404")) {
+                    eventBus.publish(new CollectionFetchStatusEvent(status : CollectionFetchStatus.FINISHED, uuid : e.uuid))
+                    return
+                }
                 if (!code.startsWith("200"))
                     throw new Exception("invalid code $code")
                 
diff --git a/core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy b/core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy
index 7958a205..b60cd85c 100644
--- a/core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy
+++ b/core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy
@@ -681,6 +681,9 @@ class ConnectionAcceptor {
                 dos?.flush()
                 dos?.close()
             } catch (Exception ignore) {}
+            try {
+                e.getOutputStream().close()
+            } catch(Exception ignore) {}
             e.close()
         }
     }