diff --git a/FileDiff/Crawler.cs b/FileDiff/Crawler.cs
index 5e8a306..5949216 100644
--- a/FileDiff/Crawler.cs
+++ b/FileDiff/Crawler.cs
@@ -15,9 +15,11 @@ public static void Crawl(string Root, string NewDir, CrawlInfo Output)
 		string NewPath = Path.Join(Root,NewDir);
 		string[] Files = Directory.GetFiles(NewPath);
 		string[] Directories = Directory.GetDirectories(NewPath);
-		foreach (string File in Files)
+		foreach (string CrawledFile in Files)
+		{
 			// Add file to the list
-			Output.Files.Add(File.Substring(File.IndexOf("/./")+3));
+			Output.Files.Add(CrawledFile.Substring(CrawledFile.IndexOf("/./")+3));
+		}
 		foreach (string Dir in Directories)
 		{
 			// Crawl subdirectory
@@ -37,7 +39,7 @@ public static void FindFolderChanges(List<string> DirectoryListMain, List<string
 			}
 
 		foreach (string FolderLocation in DirectoryListSync)
-			if (!DirectoryListMain.Contains(FolderLocation))
+			if (!DirectoryListMain.Contains(FolderLocation) && !FolderLocation.Contains(".DiffTrash"))
 			{
 				Console.ForegroundColor = ConsoleColor.DarkRed;
 				Console.WriteLine("- [{0}]",FolderLocation);
diff --git a/FileDiff/FileDiff.cs b/FileDiff/FileDiff.cs
index 7166d9e..0d84237 100644
--- a/FileDiff/FileDiff.cs
+++ b/FileDiff/FileDiff.cs
@@ -117,7 +117,7 @@ public static void Main(string[] args)
 
 		// Search for deletions
 		foreach(string FileLocation in SyncDirectoryList.Files)
-			if (!MainDirectoryList.Files.Contains(FileLocation))
+			if (!MainDirectoryList.Files.Contains(FileLocation) && !FileLocation.Contains(".DiffTrash"))
 				{
 					Console.ForegroundColor = ConsoleColor.Red;
 					Console.WriteLine("- {0}",FileLocation);
@@ -224,10 +224,13 @@ public static void Main(string[] args)
 			{
 				inc++;
 				string Path1 = Path.Join(SyncDirectory, del);
+
+				// The file could have been deleted at this point, double-check
+				if (!File.Exists(Path1))
+					continue;
 				Console.WriteLine("- {0}", del);
 				try
 				{
-					
 					string NewPath = Path.Join(GarbagePath,del);
 					if (File.Exists(NewPath))
 					{
@@ -248,8 +251,14 @@ public static void Main(string[] args)
 				try
 				{
 					string DirPath = Path.Join(SyncDirectory, del);
+					Console.WriteLine(DirPath);
+					// The directory could have been deleted at this point, double-check.
+					if (!Directory.Exists(DirPath))
+						continue;
+
 					string NewPath = Path.Join(GarbagePath, del);
-					if (File.Exists(NewPath))
+
+					if (Directory.Exists(NewPath))
 					{
 						Console.WriteLine("Warn: File with similar name already exists in trash, adding number to beginning");
 						Directory.Move(DirPath,Path.Join(GarbagePath,inc.ToString()+del));