diff --git a/src/octoprint/server/util/watchdog.py b/src/octoprint/server/util/watchdog.py
index 8bda659b..79a1cef5 100644
--- a/src/octoprint/server/util/watchdog.py
+++ b/src/octoprint/server/util/watchdog.py
@@ -6,6 +6,7 @@ __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agp
 __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms of the AGPLv3 License"
 
 import logging
+import os
 import watchdog.events
 
 import octoprint.filemanager
@@ -14,6 +15,7 @@ import octoprint.util
 
 
 class GcodeWatchdogHandler(watchdog.events.PatternMatchingEventHandler):
+
 	"""
 	Takes care of automatically "uploading" files that get added to the watched folder.
 	"""
@@ -27,40 +29,42 @@ class GcodeWatchdogHandler(watchdog.events.PatternMatchingEventHandler):
 		self._printer = printer
 
 	def _upload(self, path):
-		import os
-		file_wrapper = octoprint.filemanager.util.DiskFileWrapper(os.path.basename(path), path)
-
-		# determine current job
-		currentFilename = None
-		currentOrigin = None
-		currentJob = self._printer.get_current_job()
-		if currentJob is not None and "file" in currentJob.keys():
-			currentJobFile = currentJob["file"]
-			if "name" in currentJobFile.keys() and "origin" in currentJobFile.keys():
-				currentFilename = currentJobFile["name"]
-				currentOrigin = currentJobFile["origin"]
-
-		# determine future filename of file to be uploaded, abort if it can't be uploaded
 		try:
-			futureFilename = self._file_manager.sanitize_name(octoprint.filemanager.FileDestinations.LOCAL, file_wrapper.filename)
-		except:
-			futureFilename = None
-		if futureFilename is None or (len(self._file_manager.registered_slicers) == 0 and not octoprint.filemanager.valid_file_type(futureFilename)):
-			return
+			file_wrapper = octoprint.filemanager.util.DiskFileWrapper(os.path.basename(path), path)
 
-		# prohibit overwriting currently selected file while it's being printed
-		if futureFilename == currentFilename and currentOrigin == octoprint.filemanager.FileDestinations.LOCAL and self._printer.is_printing() or self._printer.is_paused():
-			return
+			# determine current job
+			currentFilename = None
+			currentOrigin = None
+			currentJob = self._printer.get_current_job()
+			if currentJob is not None and "file" in currentJob.keys():
+				currentJobFile = currentJob["file"]
+				if "name" in currentJobFile.keys() and "origin" in currentJobFile.keys():
+					currentFilename = currentJobFile["name"]
+					currentOrigin = currentJobFile["origin"]
 
-		self._file_manager.add_file(octoprint.filemanager.FileDestinations.LOCAL,
-		                            file_wrapper.filename,
-		                            file_wrapper,
-		                            allow_overwrite=True)
-		if os.path.exists(path):
+			# determine future filename of file to be uploaded, abort if it can't be uploaded
 			try:
-				os.remove(path)
+				futureFilename = self._file_manager.sanitize_name(octoprint.filemanager.FileDestinations.LOCAL, file_wrapper.filename)
 			except:
-				self._logger.exception("Error while trying to clear a file from the watched folder")
+				futureFilename = None
+			if futureFilename is None or (len(self._file_manager.registered_slicers) == 0 and not octoprint.filemanager.valid_file_type(futureFilename)):
+				return
+
+			# prohibit overwriting currently selected file while it's being printed
+			if futureFilename == currentFilename and currentOrigin == octoprint.filemanager.FileDestinations.LOCAL and self._printer.is_printing() or self._printer.is_paused():
+				return
+
+			self._file_manager.add_file(octoprint.filemanager.FileDestinations.LOCAL,
+			                            file_wrapper.filename,
+			                            file_wrapper,
+			                            allow_overwrite=True)
+			if os.path.exists(path):
+				try:
+					os.remove(path)
+				except:
+					self._logger.exception("Error while trying to clear a file from the watched folder")
+		except:
+			self._logger.exception("There was an error while processing the file {} in the watched folder".format(path))
 
 	def on_created(self, event):
 		self._upload(event.src_path)