diff --git a/src/HAB/Solr/Command/CommandInterface.php b/src/HAB/Solr/Command/CommandInterface.php
index 1740aa023ee1e8ae825fb7ee748608fd566bded8..fc1ad4861e7a4e78c47bd3563423b62f648327ee 100644
--- a/src/HAB/Solr/Command/CommandInterface.php
+++ b/src/HAB/Solr/Command/CommandInterface.php
@@ -23,6 +23,8 @@
 
 namespace HAB\Solr\Command;
 
+use HAB\Solr\ParamBag;
+
 /**
  * Interface of a Solr command.
  *
@@ -42,7 +44,7 @@ interface CommandInterface
     /**
      * Return parameters.
      *
-     * @return array
+     * @return ParamBag
      */
     public function getParameters ();
 
@@ -61,4 +63,4 @@ interface CommandInterface
      */
     public function getResult ();
         
-}
\ No newline at end of file
+}
diff --git a/src/HAB/Solr/Command/Invoker.php b/src/HAB/Solr/Command/Invoker.php
index 2ccea57e384ddfeb7d3e6f7a71b01124ae01cc06..2ee57757a2113f7633e4ddd89037cdfadf270441 100644
--- a/src/HAB/Solr/Command/Invoker.php
+++ b/src/HAB/Solr/Command/Invoker.php
@@ -103,7 +103,7 @@ class Invoker
      */
     public function getParameters ()
     {
-        if (is_null($this->parameters)) {
+        if ($this->parameters === null) {
             $this->setParameters(new ParamBag());
         }
         return $this->parameters;
@@ -113,7 +113,7 @@ class Invoker
      * Set parameters.
      *
      * @param  ParamBag $parameters
-     * @return
+     * @return void
      */
     public function setParameters (ParamBag $parameters)
     {
@@ -131,4 +131,4 @@ class Invoker
     {
         return sprintf('%s=%s', urlencode($name), urlencode($value));
     }
-}
\ No newline at end of file
+}