diff --git a/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java b/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java
index c37e305e7592ee3efe2303bf5f45218456acfa13..2c36a19df6aca37298edf65656c8a7701af25207 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java
@@ -39,21 +39,30 @@ public class MediaController extends BaseController
 		boolean success = true;
 		String localizedMessage = Localization.getString("upload.image.success");
 
-		try
+		if(file.isEmpty())
 		{
-			imageService.saveImageFile(file);
-		}
-		catch(IOException e)
-		{
-			e.printStackTrace();
 			success = false;
-			localizedMessage = Localization.getString("upload.image.error", e.getMessage());
+			localizedMessage = Localization.getString("upload.image.error.no.file");
 		}
-		catch(InvalidFileExtensionException e)
+		else
 		{
-			e.printStackTrace();
-			success = false;
-			localizedMessage = e.getMessage();
+
+			try
+			{
+				imageService.saveImageFile(file);
+			}
+			catch(IOException e)
+			{
+				e.printStackTrace();
+				success = false;
+				localizedMessage = Localization.getString("upload.image.error", e.getMessage());
+			}
+			catch(InvalidFileExtensionException e)
+			{
+				e.printStackTrace();
+				success = false;
+				localizedMessage = e.getMessage();
+			}
 		}
 
 		final JsonObject data = new JsonObject();
diff --git a/src/main/resources/languages/base_de.properties b/src/main/resources/languages/base_de.properties
index bab198ae0dbed3af29135acdcbf08dbcfb733307..05d17ec1785016640dd53e181b2378d944782f4c 100644
--- a/src/main/resources/languages/base_de.properties
+++ b/src/main/resources/languages/base_de.properties
@@ -141,6 +141,7 @@ notification.settings.database.delete.success=Datenbank erfolgreich gelöscht
 notification.settings.database.import.success=Import erfolgreich: {0} Konten, {1} Buchungen, {2} Kategorien, {3} Vorlagen, {4} Diagramme und {5} Bilder
 upload.image.success=Erfolgreich hochgeladen
 upload.image.error=Fehler: {0}
+upload.image.error.no.file=Fehler: Keine Datei für Upload angegeben
 upload.image.error.invalid.extension=Die Dateiendung "{0}" is nicht zugelassen für das Hochladen von Bildern
 delete.image.success=Erfolgreich gelöscht
 delete.image.error.not.existing=Fehler: Bild mit ID {0} existiert nicht
diff --git a/src/main/resources/languages/base_en.properties b/src/main/resources/languages/base_en.properties
index da750082e6ecb5a6f39edf8216d72975bb8297de..8313a53392b2fbaafd458bd815384a91a688ce14 100644
--- a/src/main/resources/languages/base_en.properties
+++ b/src/main/resources/languages/base_en.properties
@@ -141,6 +141,7 @@ notification.settings.database.delete.success=Successfully deleted database
 notification.settings.database.import.success=Import successful: {0} accounts, {1} transactions, {2} categories, {3} templates, {4} charts and {5} images
 upload.image.success=Upload successful
 upload.image.error=Error: {0}
+upload.image.error.no.file=Error: No file provided for upload
 upload.image.error.invalid.extension=File extension "{0}" is not allowed for image upload
 delete.image.success=Successfully deleted
 delete.image.error.not.existing=Error: Image with ID {0} does not exist