diff --git a/ucs-school-4.0r2/ucs-school-umc-distribution/umc/python/distribution/__init__.py b/ucs-school-4.0r2/ucs-school-umc-distribution/umc/python/distribution/__init__.py
index 7ecc23e..5b9cb29 100644
--- a/ucs-school-4.0r2/ucs-school-umc-distribution/umc/python/distribution/__init__.py
+++ b/ucs-school-4.0r2/ucs-school-umc-distribution/umc/python/distribution/__init__.py
@@ -75,15 +75,15 @@ def upload(self, request):
 		if not isinstance(request.options, (tuple, list)):
 			raise UMC_OptionTypeError( 'Expected list of dicts, but got: %s' % str(request.options) )
 
+		# create a temporary upload directory, if it does not already exist
+		if not self._tmpDir:
+			self._tmpDir = tempfile.mkdtemp(prefix='ucsschool-distribution-upload-')
+			MODULE.info('Created temporary directory: %s' % self._tmpDir)
+
 		for file in request.options:
 			if not ('tmpfile' in file and 'filename' in file):
 				raise UMC_OptionTypeError( 'Invalid upload data, got: %s' % str(file) )
 
-			# create a temporary upload directory, if it does not already exist
-			if not self._tmpDir:
-				self._tmpDir = tempfile.mkdtemp(prefix='ucsschool-distribution-upload-')
-				MODULE.info('Created temporary directory: %s' % self._tmpDir)
-
 			filename = self.__workaround_filename_bug(file)
 			destPath = os.path.join(self._tmpDir, filename)
 			MODULE.info('Received file %r, saving it to %r' % (file['tmpfile'], destPath))