diff --git a/application/core/Update/UpdateManager.php b/application/core/Update/UpdateManager.php
index 1b8db416..ab982e02 100644
--- a/application/core/Update/UpdateManager.php
+++ b/application/core/Update/UpdateManager.php
@@ -339,6 +339,14 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
 			}
 
 			$tempDir        = FileUtil::getTempFolder();
+			if (!$tempDir) {
+				$message = "Update failed: Can't save Update zip!";
+				if ($player) {
+					$this->maniaControl->getChat()->sendError($message, $player);
+				}
+				$this->maniaControl->log($message);
+				return;
+			}
 			$updateFileName = $tempDir . basename($updateData->url);
 
 			$bytes = file_put_contents($updateFileName, $updateFileContent);
@@ -359,6 +367,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
 					$this->maniaControl->getChat()->sendError($message, $player);
 				}
 				$this->maniaControl->log($message);
+				unlink($updateFileName);
 				return;
 			}