diff --git a/app/Bus/Exceptions/Component/ComponentExceptionInterface.php b/app/Bus/Exceptions/Component/ComponentExceptionInterface.php
new file mode 100644
index 00000000..211d81f7
--- /dev/null
+++ b/app/Bus/Exceptions/Component/ComponentExceptionInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Exceptions\Component;
+
+use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
+
+/**
+ * This is the component exception interface.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+interface ComponentExceptionInterface extends ExceptionInterface
+{
+    //
+}
diff --git a/app/Bus/Exceptions/ComponentGroup/ComponentGroup.php b/app/Bus/Exceptions/ComponentGroup/ComponentGroup.php
new file mode 100644
index 00000000..ac33a195
--- /dev/null
+++ b/app/Bus/Exceptions/ComponentGroup/ComponentGroup.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Exceptions\ComponentGroup;
+
+use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
+
+/**
+ * This is the component group exception interface.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+interface ComponentGroupExceptionInterface extends ExceptionInterface
+{
+    //
+}
diff --git a/app/Bus/Exceptions/Incident/IncidentExceptionInterface.php b/app/Bus/Exceptions/Incident/IncidentExceptionInterface.php
new file mode 100644
index 00000000..f6aa9be7
--- /dev/null
+++ b/app/Bus/Exceptions/Incident/IncidentExceptionInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Exceptions\Incident;
+
+use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
+
+/**
+ * This is the incident exception interface.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+interface IncidentExceptionInterface extends ExceptionInterface
+{
+    //
+}
diff --git a/app/Bus/Exceptions/Incident/InvalidIncidentTimestampException.php b/app/Bus/Exceptions/Incident/InvalidIncidentTimestampException.php
index 3843c180..8d5d8708 100644
--- a/app/Bus/Exceptions/Incident/InvalidIncidentTimestampException.php
+++ b/app/Bus/Exceptions/Incident/InvalidIncidentTimestampException.php
@@ -11,7 +11,6 @@
 
 namespace CachetHQ\Cachet\Bus\Exceptions\Incident;
 
-use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
 use Exception;
 
 /**
@@ -19,7 +18,7 @@ use Exception;
  *
  * @author James Brooks <james@alt-three.com>
  */
-class InvalidIncidentTimestampException extends Exception implements ExceptionInterface
+class InvalidIncidentTimestampException extends Exception implements IncidentExceptionInterface
 {
     //
 }
diff --git a/app/Bus/Exceptions/IncidentUpdate/IncidentUpdateExceptionInterface.php b/app/Bus/Exceptions/IncidentUpdate/IncidentUpdateExceptionInterface.php
new file mode 100644
index 00000000..3abb87db
--- /dev/null
+++ b/app/Bus/Exceptions/IncidentUpdate/IncidentUpdateExceptionInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Exceptions\IncidentUpdate;
+
+use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
+
+/**
+ * This is the incident update exception interface.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+interface IncidentUpdateExceptionInterface extends ExceptionInterface
+{
+    //
+}
diff --git a/app/Bus/Exceptions/Metric/MetricExceptionInterface.php b/app/Bus/Exceptions/Metric/MetricExceptionInterface.php
new file mode 100644
index 00000000..51dd0f44
--- /dev/null
+++ b/app/Bus/Exceptions/Metric/MetricExceptionInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Exceptions\Metric;
+
+use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
+
+/**
+ * This is the metric exception interface.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+interface MetricExceptionInterface extends ExceptionInterface
+{
+    //
+}
diff --git a/app/Bus/Exceptions/MetricPoint/MetricPointExceptionInterface.php b/app/Bus/Exceptions/MetricPoint/MetricPointExceptionInterface.php
new file mode 100644
index 00000000..a0fe628c
--- /dev/null
+++ b/app/Bus/Exceptions/MetricPoint/MetricPointExceptionInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Exceptions\MetricPoint;
+
+use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
+
+/**
+ * This is the metric point exception interface.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+interface MetricPointExceptionInterface extends ExceptionInterface
+{
+    //
+}
diff --git a/app/Bus/Exceptions/Schedule/ScheduleExceptionInterface.php b/app/Bus/Exceptions/Schedule/ScheduleExceptionInterface.php
new file mode 100644
index 00000000..61059820
--- /dev/null
+++ b/app/Bus/Exceptions/Schedule/ScheduleExceptionInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Exceptions\Schedule;
+
+use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
+
+/**
+ * This is the schedule exception interface.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+interface ScheduleExceptionInterface extends ExceptionInterface
+{
+    //
+}
diff --git a/app/Bus/Exceptions/Subscriber/SubscriberExceptionInterface.php b/app/Bus/Exceptions/Subscriber/SubscriberExceptionInterface.php
new file mode 100644
index 00000000..afee3735
--- /dev/null
+++ b/app/Bus/Exceptions/Subscriber/SubscriberExceptionInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Exceptions\Subscriber;
+
+use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
+
+/**
+ * This is the subscriber exception interface.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+interface SubscriberExceptionInterface extends ExceptionInterface
+{
+    //
+}
diff --git a/app/Bus/Exceptions/User/UserExceptionInterface.php b/app/Bus/Exceptions/User/UserExceptionInterface.php
new file mode 100644
index 00000000..e0b3d8ae
--- /dev/null
+++ b/app/Bus/Exceptions/User/UserExceptionInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Exceptions\User;
+
+use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
+
+/**
+ * This is the user exception interface.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+interface UserExceptionInterface extends ExceptionInterface
+{
+    //
+}