diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
index 9fddf47725..578d60aa41 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
@@ -50,7 +50,7 @@ class CheckCircularReferencesPass implements CompilerPassInterface
      * Checks for circular references.
      *
      * @param array $edges An array of Nodes
-     * @throws \RuntimeException When a circular reference is found.
+     * @throws ServiceCircularReferenceException When a circular reference is found.
      */
     private function checkOutEdges(array $edges)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php
index 9603a7721b..b9f9a0423f 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php
@@ -115,7 +115,8 @@ class CheckReferenceValidityPass implements CompilerPassInterface
      *
      * @param Reference  $reference
      * @param Definition $definition
-     * @throws \RuntimeException when there is an issue with the Reference scope
+     * @throws ScopeWideningInjectionException when the definition references a service of a narrower scope
+     * @throws ScopeCrossingInjectionException when the definition references a service of another scope hierarchy
      */
     private function validateScope(Reference $reference, Definition $definition = null)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php
index ecbf18ee7f..376201c9e8 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php
@@ -28,6 +28,7 @@ class RepeatedPass implements CompilerPassInterface
      * Constructor.
      *
      * @param array $passes An array of RepeatablePassInterface objects
+     * @throws InvalidArgumentException if a pass is not a RepeatablePassInterface instance
      */
     public function __construct(array $passes)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php
index c4b341cdaf..be05e3b5f0 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php
@@ -48,7 +48,7 @@ class ServiceReferenceGraph
      *
      * @param string $id The id to retrieve
      * @return ServiceReferenceGraphNode The node matching the supplied identifier
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException if no node matches the supplied identifier
      */
     public function getNode($id)
     {
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index d5bc17516e..a83c856f38 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -636,7 +636,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      * @param  string     $id         The service identifier
      * @param  Definition $definition A Definition instance
      *
-     * @throws BadMethodCallException
+     * @throws BadMethodCallException When this ContainerBuilder is frozen
      *
      * @api
      */
@@ -719,6 +719,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      *
      * @return object              The service described by the service definition
      *
+     * @throws RuntimeException         When factory specification is incomplete or scope is inactive
      * @throws InvalidArgumentException When configure callable is not callable
      */
     private function createService(Definition $definition, $id)
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index ee02af47c8..3b7c075dd4 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -292,7 +292,7 @@ class XmlFileLoader extends FileLoader
      * @param string $file
      *
      * @throws RuntimeException         When extension references a non-existent XSD file
-     * @throws InvalidArgumentException When xml doesn't validate its xsd schema
+     * @throws InvalidArgumentException When XML doesn't validate its XSD schema
      */
     private function validateSchema(\DOMDocument $dom, $file)
     {