diff --git a/src/Exception.php b/src/Exception.php
index 572a5736..cbd2f8e2 100644
--- a/src/Exception.php
+++ b/src/Exception.php
@@ -24,7 +24,6 @@
 namespace Zend\Mail;
 
 /**
- * @uses       \Zend\Exception
  * @category   Zend
  * @package    Zend_Mail
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
diff --git a/src/Part/Exception.php b/src/Part/Exception.php
index 4388831b..c14e6746 100644
--- a/src/Part/Exception.php
+++ b/src/Part/Exception.php
@@ -26,7 +26,7 @@
 use Zend\Mail;
 
 /**
- * @uses       \Zend\Exception
+ * @uses       \Zend\Mail\Exception
  * @category   Zend
  * @package    Zend_Mail
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
diff --git a/src/Protocol/Exception.php b/src/Protocol/Exception.php
index bf7d1e60..c1d2e282 100644
--- a/src/Protocol/Exception.php
+++ b/src/Protocol/Exception.php
@@ -25,7 +25,7 @@
 use Zend\Mail;
 
 /**
- * @uses       \Zend\Exception
+ * @uses       \Zend\Mail\Exception
  * @category   Zend
  * @package    Zend_Mail
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
diff --git a/src/Storage/Exception.php b/src/Storage/Exception.php
index c8290391..66758e6b 100644
--- a/src/Storage/Exception.php
+++ b/src/Storage/Exception.php
@@ -25,7 +25,7 @@
 use Zend\Mail;
 
 /**
- * @uses       \Zend\Exception
+ * @uses       \Zend\Mail\Exception
  * @category   Zend
  * @package    Zend_Mail
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
diff --git a/src/Transport/Exception.php b/src/Transport/Exception.php
index 07ffe136..c2eaed80 100644
--- a/src/Transport/Exception.php
+++ b/src/Transport/Exception.php
@@ -25,7 +25,7 @@
 use Zend\Mail;
 
 /**
- * @uses       \Zend\Exception
+ * @uses       \Zend\Mail\Exception
  * @category   Zend
  * @package    Zend_Mail
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
diff --git a/test/MessageTest.php b/test/MessageTest.php
index 948e5af4..3dcef329 100644
--- a/test/MessageTest.php
+++ b/test/MessageTest.php
@@ -162,7 +162,7 @@ public function testSplitInvalidMessage()
     {
         try {
             Mime\Decode::splitMessageStruct("--xxx\n", 'xxx');
-        } catch (\Zend\Exception $e) {
+        } catch (\Zend\Mime\Exception $e) {
             return; // ok
         }
 
@@ -173,7 +173,7 @@ public function testInvalidMailHandler()
     {
         try {
             $message = new Message(array('handler' => 1));
-        } catch (\Zend\Exception $e) {
+        } catch (\Zend\Mime\Exception $e) {
             return; // ok
         }
 
@@ -187,7 +187,7 @@ public function testMissingId()
 
         try {
             $message = new Message(array('handler' => $mail));
-        } catch (\Zend\Exception $e) {
+        } catch (\Zend\Mime\Exception $e) {
             return; // ok
         }
 
@@ -230,7 +230,7 @@ public function testSplitInvalidHeader()
         $header = '';
         try {
             Mime\Decode::splitHeaderField($header);
-        } catch (\Zend\Exception $e) {
+        } catch (\Zend\Mime\Exception $e) {
             return; // ok
         }
 
@@ -268,7 +268,7 @@ public function testNoContent()
 
         try {
             $message->getContent();
-        } catch (\Zend\Exception $e) {
+        } catch (\Zend\Mime\Exception $e) {
             return; // ok
         }
 
@@ -284,7 +284,7 @@ public function testEmptyHeader()
         $subject = null;
         try {
             $subject = $message->subject;
-        } catch (\Zend\Exception $e) {
+        } catch (\Zend\Mime\Exception $e) {
             // ok
         }
         if ($subject) {
@@ -298,7 +298,7 @@ public function testEmptyBody()
         $part = null;
         try {
             $part = $message->getPart(1);
-        } catch (\Zend\Exception $e) {
+        } catch (\Zend\Mime\Exception $e) {
             // ok
         }
         if ($part) {
@@ -329,7 +329,7 @@ public function testWrongMultipart()
 
         try {
             $message->getPart(1);
-        } catch (\Zend\Exception $e) {
+        } catch (\Zend\Mime\Exception $e) {
             return; // ok
         }
         $this->fail('no exception raised while getting part from message without boundary');