diff --git a/app/controllers/RSSController.php b/app/controllers/RSSController.php
index 055a74f3..ebec1bc2 100644
--- a/app/controllers/RSSController.php
+++ b/app/controllers/RSSController.php
@@ -14,10 +14,16 @@ class RSSController extends Controller {
         ]);
 
         Incident::get()->map(function($incident) use ($feed) {
+            $componentName = null;
+            $component = $incident->component;
+            if ($component) {
+                $componentName = $component->name;
+            }
+
             $feed->item([
                 'title'         => $incident->name,
                 'message'       => $incident->message,
-                'component'     => $incident->component->name,
+                'component'     => $componentName,
                 'status'        => $incident->humanStatus,
                 'created_at'    => $incident->created_at,
                 'updated_at'    => $incident->updated_at
diff --git a/app/views/layout/master.blade.php b/app/views/layout/master.blade.php
index 22049d7e..0e60aa2c 100644
--- a/app/views/layout/master.blade.php
+++ b/app/views/layout/master.blade.php
@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="author" content="http://james-brooks.uk">
     <meta name="apple-mobile-web-app-capable" content="yes">
+    <link rel="alternate" type="application/rss+xml" href="/rss" />
 
     <title>{{ isset($pageTitle) ? $pageTitle : Setting::get('app_name') }} | Cachet</title>