diff --git a/system/Entity.php b/system/Entity.php
index b2fbc67d3630..6a7472a55f93 100644
--- a/system/Entity.php
+++ b/system/Entity.php
@@ -294,8 +294,14 @@ public function __get(string $key)
 		{
 			$result = $this->castAs($result, $this->_options['casts'][$key]);
 		}
+		
+		if(! isset($result) && ! property_exists($this, $key))
+		{
+			throw EntityException::forTryingToAccessNonExistentProperty($key, get_called_class());
+		}
 
 		return $result;
+
 	}
 
 	//--------------------------------------------------------------------
diff --git a/system/Exceptions/EntityException.php b/system/Exceptions/EntityException.php
new file mode 100644
index 000000000000..40e301717c87
--- /dev/null
+++ b/system/Exceptions/EntityException.php
@@ -0,0 +1,22 @@
+<?php namespace CodeIgniter\Exceptions;
+
+/**
+ * Entity Exceptions.
+ */
+
+class EntityException extends AlertError
+{
+
+	/**
+	 * Error code
+	 *
+	 * @var integer
+	 */
+	protected $code = 3;
+
+	public static function forTryingToAccessNonExistentProperty(string $property, string $on)
+	{
+		throw new static(lang('Entity.tryingToAccessNonExistentProperty', [$property, $on]));
+	}
+
+}
diff --git a/system/Language/en/Entity.php b/system/Language/en/Entity.php
new file mode 100644
index 000000000000..36d5f4725aa3
--- /dev/null
+++ b/system/Language/en/Entity.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * CLI language strings.
+ *
+ * @package    CodeIgniter
+ * @author     CodeIgniter Dev Team
+ * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
+ * @license    https://opensource.org/licenses/MIT	MIT License
+ * @link       https://codeigniter.com
+ * @filesource
+ *
+ * @codeCoverageIgnore
+ */
+
+return
+[
+	'tryingToAccessNonExistentProperty' => 'Trying to access non existent property {0} of {1}'
+];