diff --git a/src/AbstractOptions.php b/src/AbstractOptions.php
index 594cc41d0..86e69c3d5 100644
--- a/src/AbstractOptions.php
+++ b/src/AbstractOptions.php
@@ -40,6 +40,7 @@ public function __construct($options = null)
 
     /**
      * @param  array|Traversable $options
+     * @throws Exception\InvalidArgumentException
      * @return void
      */
     public function setFromArray($options)
@@ -80,6 +81,7 @@ public function toArray()
      * @see ParameterObject::__set()
      * @param string $key
      * @param mixed $value
+     * @throws Exception\BadMethodCallException
      * @return void
      */
     public function __set($key, $value)
@@ -100,6 +102,7 @@ public function __set($key, $value)
     /**
      * @see ParameterObject::__get()
      * @param string $key
+     * @throws Exception\BadMethodCallException
      * @return mixed
      */
     public function __get($key)
diff --git a/src/ArrayUtils.php b/src/ArrayUtils.php
index 866b784f6..1ec57dabd 100644
--- a/src/ArrayUtils.php
+++ b/src/ArrayUtils.php
@@ -172,6 +172,7 @@ public static function isHashTable($value, $allowEmpty = false)
      *
      * @param  array|Traversable  $iterator     The array or Traversable object to convert
      * @param  bool               $recursive    Recursively check all nested structures
+     * @throws Exception\InvalidArgumentException if $iterator is not an array or a Traversable object
      * @return array
      */
     public static function iteratorToArray($iterator, $recursive = true)
diff --git a/src/CallbackHandler.php b/src/CallbackHandler.php
index bf9c47e89..7e1f19df7 100644
--- a/src/CallbackHandler.php
+++ b/src/CallbackHandler.php
@@ -52,9 +52,8 @@ class CallbackHandler
     /**
      * Constructor
      *
-     * @param  string                       $event    Event to which slot is subscribed
      * @param  string|array|object|callable $callback PHP callback
-     * @param  array                        $options  Options used by the callback handler (e.g., priority)
+     * @param  array                        $metadata  Callback metadata
      */
     public function __construct($callback, array $metadata = array())
     {
@@ -73,6 +72,7 @@ public function __construct($callback, array $metadata = array())
      * to registering the callback.
      *
      * @param  callable $callback
+     * @throws Exception\InvalidCallbackException
      * @return void
      */
     protected function registerCallback($callback)
diff --git a/src/Hydrator/Reflection.php b/src/Hydrator/Reflection.php
index be3d90d47..55d098050 100644
--- a/src/Hydrator/Reflection.php
+++ b/src/Hydrator/Reflection.php
@@ -64,7 +64,8 @@ public function hydrate(array $data, $object)
      * class has not been loaded.
      *
      * @static
-     * @param string|object $object
+     * @param string|object $input
+     * @throws Exception\InvalidArgumentException
      * @return array
      */
     protected static function getReflProperties($input)
diff --git a/src/Message.php b/src/Message.php
index e5e8f088a..f8ec758ab 100644
--- a/src/Message.php
+++ b/src/Message.php
@@ -32,6 +32,7 @@ class Message implements MessageInterface
      *
      * @param  string|int|array|Traversable $spec
      * @param  mixed $value
+     * @throws Exception\InvalidArgumentException
      * @return Message
      */
     public function setMetadata($spec, $value = null)
@@ -57,6 +58,7 @@ public function setMetadata($spec, $value = null)
      *
      * @param  null|string|int $key
      * @param  null|mixed $default
+     * @throws Exception\InvalidArgumentException
      * @return mixed
      */
     public function getMetadata($key = null, $default = null)
diff --git a/src/PriorityQueue.php b/src/PriorityQueue.php
index 372233f09..ecb8fbd31 100644
--- a/src/PriorityQueue.php
+++ b/src/PriorityQueue.php
@@ -272,6 +272,7 @@ public function hasPriority($priority)
     /**
      * Get the inner priority queue instance
      *
+     * @throws \DomainException
      * @return SplPriorityQueue
      */
     protected function getQueue()