diff --git a/watcher-monitoring/Controllers/ApiController.cs b/watcher-monitoring/Controllers/ApiController.cs
index b6e19cb..bf9ffe8 100644
--- a/watcher-monitoring/Controllers/ApiController.cs
+++ b/watcher-monitoring/Controllers/ApiController.cs
@@ -154,25 +154,26 @@ public class APIController : Controller
             // Find Server in Database
             var server = await _context.Servers.FindAsync(dto.Id);
 
-            // Add Hardware Configuration
-            try
+            if (server == null)
             {
-                server.CpuType = dto.CpuType;
-                server.CpuCores = dto.CpuCores;
-                server.GpuType = dto.GpuType;
-                server.RamSize = dto.RamSize;
-                // Diskspace fehlt
+                _logger.LogError("Server nicht gefunden");
+                return BadRequest("Server not found");
+            }
 
-                _logger.LogInformation("Harware configuration successfull for server {server}", server.Name);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex.Message);
-            }
+            // Add Hardware Configuration
+            server.CpuType = dto.CpuType;
+            server.CpuCores = dto.CpuCores;
+            server.GpuType = dto.GpuType;
+            server.RamSize = dto.RamSize;
+            // Diskspace fehlt
+
+            await _context.SaveChangesAsync();
+            _logger.LogInformation("Harware configuration successfull for server {server}", server.Name);
         }
         catch (Exception ex)
         {
             _logger.LogError(ex.Message);
+            return BadRequest(ex.Message);
         }