diff --git a/.gitignore b/.gitignore
index c52aa7a..5d5e58d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /bin/
 /testFileReader1.txt
 /state2.json
+.idea/
+logstash-forwarder-java.iml
\ No newline at end of file
diff --git a/src/main/java/info/fetter/logstashforwarder/FileWatcher.java b/src/main/java/info/fetter/logstashforwarder/FileWatcher.java
index 3d5f0c0..0744388 100644
--- a/src/main/java/info/fetter/logstashforwarder/FileWatcher.java
+++ b/src/main/java/info/fetter/logstashforwarder/FileWatcher.java
@@ -298,7 +298,8 @@ public class FileWatcher {
 	public void onFileDelete(File file) {
 		try {
 			logger.debug("Delete detected on file : " + file.getCanonicalPath());
-			oldWatchMap.get(file).setDeleted();
+			FileState state = oldWatchMap.get(file);
+			if (state != null) state.setDeleted();
 		} catch (IOException e) {
 			logger.error("Caught IOException : " + e.getMessage());
 		}