diff --git a/Changelog b/Changelog
index 6981ae373..90dc366d3 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2019-05-31 DariusIII
+	* Chg: Check if content is set, if not use empty string
 	* CHg: Update config/database, AuthServiceProvider and env.example
 	* Chg: Update laravel/horizon to version 3.2.1
 2019-05-30 DariusIII
diff --git a/app/Http/Controllers/ContentController.php b/app/Http/Controllers/ContentController.php
index fb963b833..a52d73ffe 100644
--- a/app/Http/Controllers/ContentController.php
+++ b/app/Http/Controllers/ContentController.php
@@ -63,9 +63,9 @@ class ContentController extends BasePageController
             $content = $contents->getFrontPage();
             $index = $contents->getIndex();
             $this->smarty->assign('front', true);
-            $meta_title = $index->title;
-            $meta_keywords = $index->metakeywords;
-            $meta_description = $index->metadescription;
+            $meta_title = $index->title ?? '';
+            $meta_keywords = $index->metakeyword ?? '';
+            $meta_description = $index->metadescription ?? '';
         }
 
         if (empty($content)) {