Merge branch 'useStatementFixes' of https://github.com/marc-mabe/zf2 …

…into hotfix/import-fixes

src/Client.php

@@ -395,7 +395,7 @@ public function getClassmap()
     public function setEncoding($encoding)
     {
         if (!is_string($encoding)) {
-            throw new ClientException('Invalid encoding specified');
+            throw new Exception\InvalidArgumentException('Invalid encoding specified');
         }
 
         $this->_encoding = $encoding;

src/Server.php

@@ -796,7 +796,7 @@ public function handle($request = null)
         $setRequestException = null;
         try {
             $this->_setRequest($request);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $setRequestException = $e;
         }