diff --git a/MainProject.Tests/Controllers/RoleController_Tests.cs b/MainProject.Tests/Controllers/RoleController_Tests.cs
index 7bfd290..5fcd784 100644
--- a/MainProject.Tests/Controllers/RoleController_Tests.cs
+++ b/MainProject.Tests/Controllers/RoleController_Tests.cs
@@ -33,7 +33,7 @@ public class RoleController_Tests
     {
         IConfiguration configuration = TestUtils.CreateConfiguration();
         _roleServiceMock = new Mock<IRoleService>();
-        _roleController = new RoleController(configuration, _roleServiceMock?.Object);
+        _roleController = new RoleController(configuration, _roleServiceMock.Object);
     }
 
     [TestMethod]
diff --git a/MainProject/Controllers/AuthController.cs b/MainProject/Controllers/AuthController.cs
index 1baf173..6d9cb6f 100644
--- a/MainProject/Controllers/AuthController.cs
+++ b/MainProject/Controllers/AuthController.cs
@@ -55,7 +55,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
             }
             catch (Exception exception)
             {
-                var message = "Something went wrong";
+                var message = this._somethingWentWrong;
                 if (!String.IsNullOrEmpty(exception.Message))
                 {
                     message += $". {exception.Message}";
diff --git a/MainProject/Controllers/BaseController.cs b/MainProject/Controllers/BaseController.cs
index b8c8eb4..ec2f51b 100644
--- a/MainProject/Controllers/BaseController.cs
+++ b/MainProject/Controllers/BaseController.cs
@@ -13,6 +13,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
         protected readonly IConfiguration _configuration;
         protected readonly AppSettings _appSettings;
         protected readonly string _requestNotWellFormed = "Request is not well formed";
+        protected readonly string _somethingWentWrong = "Something went wrong";
 
         protected BaseController(
             IConfiguration configuration
diff --git a/MainProject/Controllers/RoleController.cs b/MainProject/Controllers/RoleController.cs
index 7aad3c5..5b369a1 100644
--- a/MainProject/Controllers/RoleController.cs
+++ b/MainProject/Controllers/RoleController.cs
@@ -54,7 +54,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
             }
             catch (Exception exception)
             {
-                var message = "Something went wrong";
+                var message = this._somethingWentWrong;
                 if (!String.IsNullOrEmpty(exception.Message))
                 {
                     message += $". {exception.Message}";
@@ -105,7 +105,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
             }
             catch (Exception exception)
             {
-                var message = "Something went wrong";
+                var message = this._somethingWentWrong;
                 if (!String.IsNullOrEmpty(exception.Message))
                 {
                     message += $". {exception.Message}";
@@ -146,7 +146,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
                     return NotFound();
                 }
 
-                if(role.IsNotEditable)
+                if (role.IsNotEditable)
                 {
                     return BadRequest("This role is not editable");
                 }
@@ -170,7 +170,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
             }
             catch (Exception exception)
             {
-                var message = "Something went wrong";
+                var message = this._somethingWentWrong;
                 if (!String.IsNullOrEmpty(exception.Message))
                 {
                     message += $". {exception.Message}";
@@ -212,7 +212,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
             }
             catch (Exception exception)
             {
-                var message = "Something went wrong";
+                var message = this._somethingWentWrong;
                 if (!String.IsNullOrEmpty(exception.Message))
                 {
                     message += $". {exception.Message}";
diff --git a/MainProject/Controllers/UserController.cs b/MainProject/Controllers/UserController.cs
index 23ab705..cd9502b 100644
--- a/MainProject/Controllers/UserController.cs
+++ b/MainProject/Controllers/UserController.cs
@@ -57,7 +57,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
             }
             catch (Exception exception)
             {
-                var message = "Something went wrong";
+                var message = this._somethingWentWrong;
                 if (!String.IsNullOrEmpty(exception.Message))
                 {
                     message += $". {exception.Message}";
@@ -118,7 +118,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
             }
             catch (Exception exception)
             {
-                var message = "Something went wrong";
+                var message = this._somethingWentWrong;
                 if (!String.IsNullOrEmpty(exception.Message))
                 {
                     message += $". {exception.Message}";