diff --git a/config.xsd b/config.xsd
index 4c1f462d0..f764fe3a6 100644
--- a/config.xsd
+++ b/config.xsd
@@ -150,7 +150,7 @@
             <xs:element name="InvalidArrayAssignment" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="InvalidArrayOffset" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="InvalidCast" type="IssueHandlerType" minOccurs="0" />
-            <xs:element name="InvalidCatch" type="IssueHandlerType" minOccurs="0" />
+            <xs:element name="InvalidCatch" type="ClassIssueHandlerType" minOccurs="0" />
             <xs:element name="InvalidClass" type="ClassIssueHandlerType" minOccurs="0" />
             <xs:element name="InvalidClone" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="InvalidParamDefault" type="IssueHandlerType" minOccurs="0" />
@@ -173,7 +173,7 @@
             <xs:element name="InvalidStaticInvocation" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="InvalidStaticVariable" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="InvalidStringClass" type="IssueHandlerType" minOccurs="0" />
-            <xs:element name="InvalidThrow" type="IssueHandlerType" minOccurs="0" />
+            <xs:element name="InvalidThrow" type="ClassIssueHandlerType" minOccurs="0" />
             <xs:element name="InvalidToString" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="LessSpecificImplementedReturnType" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="LessSpecificReturnStatement" type="IssueHandlerType" minOccurs="0" />
diff --git a/src/Psalm/Checker/Statements/Block/TryChecker.php b/src/Psalm/Checker/Statements/Block/TryChecker.php
index 7b612e587..6d062f95c 100644
--- a/src/Psalm/Checker/Statements/Block/TryChecker.php
+++ b/src/Psalm/Checker/Statements/Block/TryChecker.php
@@ -176,7 +176,8 @@ class TryChecker
                     if (IssueBuffer::accepts(
                         new InvalidCatch(
                             'Class/interface ' . $fq_catch_class . ' cannot be caught',
-                            new CodeLocation($statements_checker->getSource(), $stmt)
+                            new CodeLocation($statements_checker->getSource(), $stmt),
+                            $fq_catch_class
                         ),
                         $statements_checker->getSuppressedIssues()
                     )) {
diff --git a/src/Psalm/Checker/Statements/ThrowChecker.php b/src/Psalm/Checker/Statements/ThrowChecker.php
index 4c09e7150..67f7aaea0 100644
--- a/src/Psalm/Checker/Statements/ThrowChecker.php
+++ b/src/Psalm/Checker/Statements/ThrowChecker.php
@@ -33,20 +33,26 @@ class ThrowChecker
             $file_checker = $statements_checker->getFileChecker();
             $project_checker = $file_checker->project_checker;
 
-            if (!TypeChecker::isContainedBy($project_checker->codebase, $throw_type, $exception_type)) {
-                if (IssueBuffer::accepts(
-                    new InvalidThrow(
-                        'Cannot throw ' . $throw_type . ' as it does not extend Exception or implement Throwable',
-                        new CodeLocation($file_checker, $stmt)
-                    ),
-                    $statements_checker->getSuppressedIssues()
-                )) {
-                    return false;
-                }
-            } elseif ($context->collect_exceptions) {
-                foreach ($throw_type->getTypes() as $throw_atomic_type) {
-                    if ($throw_atomic_type instanceof TNamedObject) {
-                        $context->possibly_thrown_exceptions[$throw_atomic_type->value] = true;
+            foreach ($throw_type->getTypes() as $throw_type_part) {
+                $throw_type_candidate = new Union([$throw_type_part]);
+
+                if (!TypeChecker::isContainedBy($project_checker->codebase, $throw_type_candidate, $exception_type)) {
+                    if (IssueBuffer::accepts(
+                        new InvalidThrow(
+                            'Cannot throw ' . $throw_type_part
+                                . ' as it does not extend Exception or implement Throwable',
+                            new CodeLocation($file_checker, $stmt),
+                            (string) $throw_type_part
+                        ),
+                        $statements_checker->getSuppressedIssues()
+                    )) {
+                        return false;
+                    }
+                } elseif ($context->collect_exceptions) {
+                    foreach ($throw_type->getTypes() as $throw_atomic_type) {
+                        if ($throw_atomic_type instanceof TNamedObject) {
+                            $context->possibly_thrown_exceptions[$throw_atomic_type->value] = true;
+                        }
                     }
                 }
             }
diff --git a/src/Psalm/Issue/InvalidCatch.php b/src/Psalm/Issue/InvalidCatch.php
index 45611d740..ba28f75ff 100644
--- a/src/Psalm/Issue/InvalidCatch.php
+++ b/src/Psalm/Issue/InvalidCatch.php
@@ -1,6 +1,6 @@
 <?php
 namespace Psalm\Issue;
 
-class InvalidCatch extends CodeIssue
+class InvalidCatch extends ClassIssue
 {
 }
diff --git a/src/Psalm/Issue/InvalidThrow.php b/src/Psalm/Issue/InvalidThrow.php
index 1167a1a62..106e4aa42 100644
--- a/src/Psalm/Issue/InvalidThrow.php
+++ b/src/Psalm/Issue/InvalidThrow.php
@@ -1,6 +1,6 @@
 <?php
 namespace Psalm\Issue;
 
-class InvalidThrow extends CodeIssue
+class InvalidThrow extends ClassIssue
 {
 }
diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
index 6984ed4cf..24e96b250 100644
--- a/tests/ConfigTest.php
+++ b/tests/ConfigTest.php
@@ -764,6 +764,162 @@ class ConfigTest extends TestCase
         $this->analyzeFile($file_path, new Context());
     }
 
+    /**
+     * @expectedException  \Psalm\Exception\CodeException
+     * @expectedExceptionMessage  InvalidCatch
+     * @return void
+     */
+    public function testValidThrowInvalidCatch()
+    {
+        $this->project_checker = $this->getProjectCheckerWithConfig(
+            TestConfig::loadFromXML(
+                dirname(__DIR__),
+                '<?xml version="1.0"?>
+                <psalm>
+                    <issueHandlers>
+                        <InvalidThrow>
+                            <errorLevel type="suppress">
+                                <referencedClass name="I" />
+                            </errorLevel>
+                        </InvalidThrow>
+                    </issueHandlers>
+                </psalm>'
+            )
+        );
+
+        $file_path = getcwd() . '/src/somefile.php';
+
+        $this->addFile(
+            $file_path,
+            '<?php
+                interface I {}
+
+                class E extends Exception implements I {}
+
+                function foo() : void {
+                    throw new E();
+                }
+
+                function handleThrow(I $e) : void {
+                    echo "about to throw";
+                    throw $e;
+                }
+
+                try {
+                    foo();
+                } catch (I $e) {
+                    handleThrow($e);
+                }'
+        );
+
+        $this->analyzeFile($file_path, new Context());
+    }
+
+    /**
+     * @expectedException  \Psalm\Exception\CodeException
+     * @expectedExceptionMessage  InvalidThrow
+     * @return void
+     */
+    public function testInvalidThrowValidCatch()
+    {
+        $this->project_checker = $this->getProjectCheckerWithConfig(
+            TestConfig::loadFromXML(
+                dirname(__DIR__),
+                '<?xml version="1.0"?>
+                <psalm>
+                    <issueHandlers>
+                        <InvalidCatch>
+                            <errorLevel type="suppress">
+                                <referencedClass name="I" />
+                            </errorLevel>
+                        </InvalidCatch>
+                    </issueHandlers>
+                </psalm>'
+            )
+        );
+
+        $file_path = getcwd() . '/src/somefile.php';
+
+        $this->addFile(
+            $file_path,
+            '<?php
+                interface I {}
+
+                class E extends Exception implements I {}
+
+                function foo() : void {
+                    throw new E();
+                }
+
+                function handleThrow(I $e) : void {
+                    echo "about to throw";
+                    throw $e;
+                }
+
+                try {
+                    foo();
+                } catch (I $e) {
+                    handleThrow($e);
+                }'
+        );
+
+        $this->analyzeFile($file_path, new Context());
+    }
+
+    /**
+     * @return void
+     */
+    public function testValidThrowValidCatch()
+    {
+        $this->project_checker = $this->getProjectCheckerWithConfig(
+            TestConfig::loadFromXML(
+                dirname(__DIR__),
+                '<?xml version="1.0"?>
+                <psalm>
+                    <issueHandlers>
+                        <InvalidCatch>
+                            <errorLevel type="suppress">
+                                <referencedClass name="I" />
+                            </errorLevel>
+                        </InvalidCatch>
+                        <InvalidThrow>
+                            <errorLevel type="suppress">
+                                <referencedClass name="I" />
+                            </errorLevel>
+                        </InvalidThrow>
+                    </issueHandlers>
+                </psalm>'
+            )
+        );
+
+        $file_path = getcwd() . '/src/somefile.php';
+
+        $this->addFile(
+            $file_path,
+            '<?php
+                interface I {}
+
+                class E extends Exception implements I {}
+
+                function foo() : void {
+                    throw new E();
+                }
+
+                function handleThrow(I $e) : void {
+                    echo "about to throw";
+                    throw $e;
+                }
+
+                try {
+                    foo();
+                } catch (I $e) {
+                    handleThrow($e);
+                }'
+        );
+
+        $this->analyzeFile($file_path, new Context());
+    }
+
     /**
      * @return void
      */