diff --git a/lib/Service/AttachmentService.php b/lib/Service/AttachmentService.php
index 1836249e1..a2bbcbc0a 100644
--- a/lib/Service/AttachmentService.php
+++ b/lib/Service/AttachmentService.php
@@ -32,9 +32,11 @@ use OCA\Deck\Db\CardMapper;
 use OCA\Deck\InvalidAttachmentType;
 use OCA\Deck\NoPermissionException;
 use OCA\Deck\NotFoundException;
+use OCA\Deck\StatusException;
 use OCP\AppFramework\Http\Response;
 use OCP\ICache;
 use OCP\ICacheFactory;
+use OCP\IL10N;
 
 class AttachmentService {
 
@@ -48,6 +50,8 @@ class AttachmentService {
 	private $application;
 	/** @var ICache */
 	private $cache;
+	/** @var IL10N */
+	private $l10n;
 
 	/**
 	 * AttachmentService constructor.
@@ -58,16 +62,17 @@ class AttachmentService {
 	 * @param Application $application
 	 * @param ICacheFactory $cacheFactory
 	 * @param $userId
+	 * @param IL10N $l10n
 	 * @throws \OCP\AppFramework\QueryException
 	 */
-	public function __construct(AttachmentMapper $attachmentMapper, CardMapper $cardMapper, PermissionService $permissionService, Application $application, ICacheFactory $cacheFactory, $userId) {
+	public function __construct(AttachmentMapper $attachmentMapper, CardMapper $cardMapper, PermissionService $permissionService, Application $application, ICacheFactory $cacheFactory, $userId, IL10N $l10n) {
 		$this->attachmentMapper = $attachmentMapper;
 		$this->cardMapper = $cardMapper;
 		$this->permissionService = $permissionService;
 		$this->userId = $userId;
 		$this->application = $application;
 		$this->cache = $cacheFactory->createDistributed('deck-card-attachments-');
-
+		$this->l10n = $l10n;
 
 		// Register shipped attachment services
 		// TODO: move this to a plugin based approach once we have different types of attachments
@@ -145,6 +150,9 @@ class AttachmentService {
 		} catch (InvalidAttachmentType $e) {
 			// just store the data
 		}
+		if ($attachment->getData() === null) {
+			throw new StatusException($this->l10n->t('No data was provided to create an attachment.'));
+		}
 		$attachment = $this->attachmentMapper->insert($attachment);
 
 		// extend data so the frontend can use it properly after creating
diff --git a/lib/Service/FileService.php b/lib/Service/FileService.php
index bf2553ac4..16726f6f2 100644
--- a/lib/Service/FileService.php
+++ b/lib/Service/FileService.php
@@ -25,9 +25,11 @@ namespace OCA\Deck\Service;
 
 use OC\Security\CSP\ContentSecurityPolicyManager;
 use OCA\Deck\Db\Attachment;
+use OCA\Deck\StatusException;
 use OCP\AppFramework\Http\ContentSecurityPolicy;
 use OCP\AppFramework\Http\EmptyContentSecurityPolicy;
 use OCP\AppFramework\Http\FileDisplayResponse;
+use OCP\Files\Cache\IScanner;
 use OCP\Files\IAppData;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
@@ -100,6 +102,10 @@ class FileService implements IAttachmentService {
 		return $attachment;
 	}
 
+	/**
+	 * @return array
+	 * @throws StatusException
+	 */
 	private function getUploadedFile () {
 		$file = $this->request->getUploadedFile('file');
 		$error = null;
@@ -115,13 +121,13 @@ class FileService implements IAttachmentService {
 		];
 
 		if (empty($file)) {
-			$error = $this->l10n->t('No file uploaded');
+			$error = $this->l10n->t('No file uploaded or file size exceeds maximum of %s', [\OCP\Util::humanFileSize(\OCP\Util::uploadLimit())]);
 		}
 		if (!empty($file) && array_key_exists('error', $file) && $file['error'] !== UPLOAD_ERR_OK) {
 			$error = $phpFileUploadErrors[$file['error']];
 		}
 		if ($error !== null) {
-			throw new \Exception($error);
+			throw new StatusException($error);
 		}
 		return $file;
 	}
@@ -131,7 +137,7 @@ class FileService implements IAttachmentService {
 		$folder = $this->getFolder($attachment);
 		$fileName = $file['name'];
 		if ($folder->fileExists($fileName)) {
-			throw new \Exception('File already exists.');
+			throw new StatusException('File already exists.');
 		}
 		$target = $folder->newFile($fileName);
 		$target->putContent(file_get_contents($file['tmp_name'], 'r'));
@@ -141,6 +147,8 @@ class FileService implements IAttachmentService {
 
 	/**
 	 * This method requires to be used with POST so we can properly get the form data
+	 *
+	 * @throws \Exception
 	 */
 	public function update(Attachment $attachment) {
 		$file = $this->getUploadedFile();