diff --git a/source/cartastraccia/endpoint.d b/source/cartastraccia/endpoint.d
index 0f6f8bf..296cf64 100644
--- a/source/cartastraccia/endpoint.d
+++ b/source/cartastraccia/endpoint.d
@@ -41,7 +41,11 @@
 					fl.each!(
 						(RSSFeed f) {
 							// send task for response from server
-							tasks[f.name].send(Task.getThis());
+							if(f.name in tasks) tasks[f.name].send(Task.getThis());
+							else {
+								tasks.remove(f.name);
+								return;
+							}
 
 							// validate feeds
 							auto resp = receiveOnly!FeedActorResponse;
@@ -55,6 +59,7 @@
 
 							validFeeds ~= f;
 						});
+					feedList = validFeeds;
 					res.render!("index.dt", req, validFeeds);
 				});
 	}