diff --git a/Apps.Lionbridge/Api/LionbridgeClient.cs b/Apps.Lionbridge/Api/LionbridgeClient.cs
index e24009a..d49fed4 100644
--- a/Apps.Lionbridge/Api/LionbridgeClient.cs
+++ b/Apps.Lionbridge/Api/LionbridgeClient.cs
@@ -76,7 +76,7 @@ protected override Exception ConfigureErrorException(RestResponse response)
         }
         catch (Exception e)
         {
-            return new Exception($"Error was thrown while executing request, response content: {response.Content}; status code: {response.StatusCode}");
+            return new Exception($"Error was thrown while executing request, response content: {response.Content}; status code: {response.StatusCode}; Exception message: {e.Message}");
         }
     }
 
diff --git a/Apps.Lionbridge/Webhooks/Handlers/BaseWebhookHandler.cs b/Apps.Lionbridge/Webhooks/Handlers/BaseWebhookHandler.cs
index a0a1b57..4aa879e 100644
--- a/Apps.Lionbridge/Webhooks/Handlers/BaseWebhookHandler.cs
+++ b/Apps.Lionbridge/Webhooks/Handlers/BaseWebhookHandler.cs
@@ -36,7 +36,8 @@ public async Task SubscribeAsync(IEnumerable<AuthenticationCredentialsProvider>
         }
         
         var bridge = new BridgeService(authenticationCredentialsProviders, _bridgeServiceUrl);
-        bridge.Subscribe(GetEventType(), listener.ListenerId, values["payloadUrl"]);
+        string eventType = GetEventType();
+        bridge.Subscribe(eventType, listener.ListenerId, values["payloadUrl"]);
     }
 
     public async Task UnsubscribeAsync(IEnumerable<AuthenticationCredentialsProvider> authenticationCredentialsProviders, 
@@ -46,7 +47,8 @@ public async Task UnsubscribeAsync(IEnumerable<AuthenticationCredentialsProvider
         if (listener != null)
         {
             var bridge = new BridgeService(authenticationCredentialsProviders, _bridgeServiceUrl);
-            bridge.Unsubscribe(GetEventType(), listener.ListenerId, values["payloadUrl"]);
+            string eventType = GetEventType();
+            bridge.Unsubscribe(eventType, listener.ListenerId, values["payloadUrl"]);
             await DeleteListenerAsync(listener.ListenerId);
         }
     }
@@ -82,6 +84,19 @@ private async Task DeleteListenerAsync(string listenerId)
     }
 
     protected abstract string[] GetStatusCodes();
-    
-    protected abstract string GetEventType();
+
+    private string GetEventType()
+    {
+        if(SubscriptionEvent.Contains("JOB"))
+        {
+            return "JOB_UPDATE";
+        }
+        
+        if(SubscriptionEvent.Contains("REQUEST"))
+        {
+            return "REQUEST_UPDATE";
+        }
+        
+        throw new Exception("Invalid event type");
+    }
 }
\ No newline at end of file
diff --git a/Apps.Lionbridge/Webhooks/Handlers/JobStatusUpdatedHandler.cs b/Apps.Lionbridge/Webhooks/Handlers/JobStatusUpdatedHandler.cs
index 77a4e5f..6ebe34a 100644
--- a/Apps.Lionbridge/Webhooks/Handlers/JobStatusUpdatedHandler.cs
+++ b/Apps.Lionbridge/Webhooks/Handlers/JobStatusUpdatedHandler.cs
@@ -12,9 +12,4 @@ protected override string[] GetStatusCodes()
     {
         return ["IN_TRANSLATION", "CANCELLED", "SENT_TO_PROVIDER"];
     }
-    
-    protected override string GetEventType()
-    {
-        return "JOB_UPDATE";
-    }
 }
\ No newline at end of file
diff --git a/Apps.Lionbridge/Webhooks/Handlers/RequestStatusUpdatedHandler.cs b/Apps.Lionbridge/Webhooks/Handlers/RequestStatusUpdatedHandler.cs
index cf0df14..8a958b4 100644
--- a/Apps.Lionbridge/Webhooks/Handlers/RequestStatusUpdatedHandler.cs
+++ b/Apps.Lionbridge/Webhooks/Handlers/RequestStatusUpdatedHandler.cs
@@ -11,9 +11,4 @@ protected override string[] GetStatusCodes()
     {
         return new[] { "IN_TRANSLATION", "CANCELLED", "REVIEW_TRANSLATION" };
     }
-
-    protected override string GetEventType()
-    {
-        return "REQUEST_UPDATE";
-    }
 }
\ No newline at end of file