diff --git a/SessionCompanion/SessionCompanion/Controllers/WeaponController.cs b/SessionCompanion/SessionCompanion/Controllers/WeaponController.cs
index 69bbd60..1dada82 100644
--- a/SessionCompanion/SessionCompanion/Controllers/WeaponController.cs
+++ b/SessionCompanion/SessionCompanion/Controllers/WeaponController.cs
@@ -25,14 +25,19 @@ namespace SessionCompanion.Controllers
         [HttpGet("getAllWeapons")]
         public async Task<Either<List<WeaponViewModel>, ErrorResponse>> GetWeapons() 
         {
-            var weapons = _service.Get().ToList();
-            if (!weapons.Any())
+            try
+            {
+                var weapons = _service.Get().ToList();
+                return weapons;
+            }
+            catch (Exception e)
+            {
                 return new ErrorResponse()
                 {
                     StatusCode = 204,
-                    Message = "No weapons in database"
+                    Message = e.Message
                 };
-            return weapons;
+            }
         }
     }
 }