diff --git a/app/Bus/Handlers/Events/Beacon/LogBeaconFailedHandler.php b/app/Bus/Handlers/Events/Beacon/LogBeaconFailedHandler.php
new file mode 100644
index 00000000..f69cf49f
--- /dev/null
+++ b/app/Bus/Handlers/Events/Beacon/LogBeaconFailedHandler.php
@@ -0,0 +1,34 @@
+<?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\Handlers\Events\Beacon;
+
+use CachetHQ\Cachet\Bus\Events\Beacon\BeaconFailedToSendEvent;
+
+/**
+ * This is the log beacon failed handler.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class LogBeaconFailedHandler
+{
+    /**
+     * Handle the event.
+     *
+     * @param \CachetHQ\Cachet\Bus\Events\Beacon\BeaconFailedToSendEvent $event
+     *
+     * @return void
+     */
+    public function handle(BeaconFailedToSendEvent $event)
+    {
+        logger('Beacon failed.');
+    }
+}
diff --git a/app/Foundation/Providers/EventServiceProvider.php b/app/Foundation/Providers/EventServiceProvider.php
index 626379c3..7ee8d180 100644
--- a/app/Foundation/Providers/EventServiceProvider.php
+++ b/app/Foundation/Providers/EventServiceProvider.php
@@ -22,7 +22,7 @@ class EventServiceProvider extends ServiceProvider
      */
     protected $listen = [
         'CachetHQ\Cachet\Bus\Events\Beacon\BeaconFailedToSendEvent' => [
-            //
+            'CachetHQ\Cachet\Bus\Handlers\Events\Beacon\LogBeaconFailedHandler',
         ],
         'CachetHQ\Cachet\Bus\Events\Beacon\BeaconWasSentEvent' => [
             //
diff --git a/app/Integrations/Core/Beacon.php b/app/Integrations/Core/Beacon.php
index f3aba9b5..44f141d9 100644
--- a/app/Integrations/Core/Beacon.php
+++ b/app/Integrations/Core/Beacon.php
@@ -111,7 +111,6 @@ class Beacon implements BeaconContract
                 'json'    => $payload,
             ]);
         } catch (Exception $e) {
-            // TODO: Log a warning that the beacon could not be sent.
             event(new BeaconFailedToSendEvent());
 
             return;
diff --git a/tests/Bus/Events/Beacon/BeaconFailedToSendEventTest.php b/tests/Bus/Events/Beacon/BeaconFailedToSendEventTest.php
index 5c785ef2..977e3ac3 100644
--- a/tests/Bus/Events/Beacon/BeaconFailedToSendEventTest.php
+++ b/tests/Bus/Events/Beacon/BeaconFailedToSendEventTest.php
@@ -22,7 +22,7 @@ class BeaconFailedToSendEventTest extends AbstractBeaconEventTestCase
 {
     protected function objectHasHandlers()
     {
-        return false;
+        return true;
     }
 
     protected function getObjectAndParams()