diff --git a/phpBB/includes/di/pass/kernel_pass.php b/phpBB/includes/di/pass/kernel_pass.php
index d186ff2767..a701ebcfa6 100644
--- a/phpBB/includes/di/pass/kernel_pass.php
+++ b/phpBB/includes/di/pass/kernel_pass.php
@@ -29,7 +29,6 @@ class phpbb_di_pass_kernel_pass implements CompilerPassInterface
 	public function process(ContainerBuilder $container)
 	{
 		$definition = $container->getDefinition('dispatcher');
-		$user = $container->get('user');
 
 		foreach ($container->findTaggedServiceIds('kernel.event_listener') as $id => $events)
 		{
@@ -39,12 +38,12 @@ class phpbb_di_pass_kernel_pass implements CompilerPassInterface
 
 				if (!isset($event['event']))
 				{
-					throw new InvalidArgumentException($user->lang('NO_EVENT_ATTRIBUTE', $id));
+					throw new InvalidArgumentException(sprintf('Service "%1$s" must define the "event" attribute on "kernel.event_listener" tags.', $id));
 				}
 
 				if (!isset($event['method']))
 				{
-					throw new InvalidArgumentException($user->lang('NO_METHOD_ATTRIBUTE', $id));
+					throw new InvalidArgumentException(sprintf('Service "%1$s" must define the "method" attribute on "kernel.event_listener" tags.', $id));
 				}
 
 				$definition->addMethodCall('addListenerService', array($event['event'], array($id, $event['method']), $priority));
@@ -60,7 +59,7 @@ class phpbb_di_pass_kernel_pass implements CompilerPassInterface
 			$interface = 'Symfony\Component\EventDispatcher\EventSubscriberInterface';
 			if (!$refClass->implementsInterface($interface))
 			{
-				throw new InvalidArgumentException($user->lang('SUBSCRIBER_WRONG_TYPE', $id, $interface));
+				throw new InvalidArgumentException(sprintf('Service "%1$s" must implement interface "%2$s".', $id, $interface));
 			}
 
 			$definition->addMethodCall('addSubscriberService', array($id, $class));
diff --git a/phpBB/language/en/app.php b/phpBB/language/en/app.php
index 2cbeaa2cba..2d67246369 100644
--- a/phpBB/language/en/app.php
+++ b/phpBB/language/en/app.php
@@ -47,11 +47,6 @@ $lang = array_merge($lang, array(
 	'CONTROLLER_SERVICE_UNDEFINED'		=> 'The service for controller "<strong>%s</strong>" is not defined in ./config/services.yml.',
 	'CONTROLLER_RETURN_TYPE_INVALID'	=> 'The controller object <strong>%s</strong> must return a Symfony\Component\HttpFoundation\Response object.',
 
-	// Event Listener/Subscriber error messages
-	'NO_EVENT_ATTRIBUTE'				=> 'Service "%1$s" must define the "event" attribute on "kernel.event_listener" tags.',
-	'NO_METHOD_ATTRIBUTE'				=> 'Service "%1$s" must define the "method" attribute on "kernel.event_listener" tags.',
-	'SUBSCRIBER_WRONG_TYPE'				=> 'Service "%1$s" must implement interface "%2$s".',
-
 	// Core error controller messages
 	'PAGE_NOT_FOUND_ERROR'				=> 'The page you have requested does not exist.',
 	'NOT_AUTHORISED_ERROR'				=> 'You do not have permission to access this page.',