diff --git a/src/BoomCMS/Core/Template/Provider.php b/src/BoomCMS/Core/Template/Provider.php
index <HASH>..<HASH> 100644
--- a/src/BoomCMS/Core/Template/Provider.php
+++ b/src/BoomCMS/Core/Template/Provider.php
@@ -27,7 +27,10 @@ class Provider
 
     public function findById($id)
     {
-        return new Template(Model::find($id)->toArray());
+        $model = Model::find($id);
+        $attrs = $model ? $model->toArray() : [];
+
+        return new Template($attrs);
     }
 
     public function findByThemeAndFilename($theme, $filename)
Fixed bug in template provider when template is not found by ID