diff --git a/MANIFEST.in b/MANIFEST.in
index 72be21669..178716d12 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,6 @@
 include LICENSE
 include README
+include Makefile
 include deluge.desktop
 include deluge.xpm
 include msgfmt.py
diff --git a/src/core.py b/src/core.py
index 50115d06f..cad73f1e6 100644
--- a/src/core.py
+++ b/src/core.py
@@ -643,6 +643,10 @@ class Manager:
 		torrents_with_unique_ID = self.unique_IDs.values()
 
 		for torrent in self.state.torrents:
+			if not os.path.exists(torrent.filename):
+				print "Missing file: %s" % torrent.filename
+				self.state.torrents.remove(torrent)
+				continue
 			if torrent not in torrents_with_unique_ID:
 #				print "Adding torrent to core:", torrent.filename, torrent.save_dir, torrent.compact
 				try: