diff --git a/mobile/lib/modules/login/ui/login_form.dart b/mobile/lib/modules/login/ui/login_form.dart
index f6e07c18..76e6f5bc 100644
--- a/mobile/lib/modules/login/ui/login_form.dart
+++ b/mobile/lib/modules/login/ui/login_form.dart
@@ -78,7 +78,7 @@ class EmailInput extends StatelessWidget {
     return TextFormField(
       controller: controller,
       decoration:
-          const InputDecoration(labelText: 'email', border: OutlineInputBorder(), hintText: 'youremail@email.com'),
+          const InputDecoration(labelText: 'Email', border: OutlineInputBorder(), hintText: 'youremail@email.com'),
     );
   }
 }
diff --git a/server/src/api-v1/asset/asset.controller.ts b/server/src/api-v1/asset/asset.controller.ts
index dfb0a82b..4af564ca 100644
--- a/server/src/api-v1/asset/asset.controller.ts
+++ b/server/src/api-v1/asset/asset.controller.ts
@@ -13,6 +13,7 @@ import {
   Response,
   Headers,
   Delete,
+  Logger,
 } from '@nestjs/common';
 import { JwtAuthGuard } from '../../modules/immich-jwt/guards/jwt-auth.guard';
 import { AssetService } from './asset.service';
@@ -55,17 +56,21 @@ export class AssetController {
     @Body(ValidationPipe) assetInfo: CreateAssetDto,
   ) {
     for (const file of uploadFiles.assetData) {
-      const savedAsset = await this.assetService.createUserAsset(authUser, assetInfo, file.path, file.mimetype);
+      try {
+        const savedAsset = await this.assetService.createUserAsset(authUser, assetInfo, file.path, file.mimetype);
 
-      if (uploadFiles.thumbnailData != null) {
-        await this.assetService.updateThumbnailInfo(savedAsset.id, uploadFiles.thumbnailData[0].path);
-        await this.backgroundTaskService.tagImage(uploadFiles.thumbnailData[0].path, savedAsset);
-        await this.backgroundTaskService.detectObject(uploadFiles.thumbnailData[0].path, savedAsset);
+        if (uploadFiles.thumbnailData != null && savedAsset) {
+          await this.assetService.updateThumbnailInfo(savedAsset.id, uploadFiles.thumbnailData[0].path);
+          await this.backgroundTaskService.tagImage(uploadFiles.thumbnailData[0].path, savedAsset);
+          await this.backgroundTaskService.detectObject(uploadFiles.thumbnailData[0].path, savedAsset);
+        }
+
+        await this.backgroundTaskService.extractExif(savedAsset, file.originalname, file.size);
+
+        this.wsCommunicateionGateway.server.to(savedAsset.userId).emit('on_upload_success', JSON.stringify(savedAsset));
+      } catch (e) {
+        Logger.error(`Error receiving upload file ${e}`);
       }
-
-      await this.backgroundTaskService.extractExif(savedAsset, file.originalname, file.size);
-
-      this.wsCommunicateionGateway.server.to(savedAsset.userId).emit('on_upload_success', JSON.stringify(savedAsset));
     }
 
     return 'ok';