diff --git a/classes/lnApp/SystemMessage.php b/classes/lnApp/SystemMessage.php
index b8bec9c..8e462d9 100644
--- a/classes/lnApp/SystemMessage.php
+++ b/classes/lnApp/SystemMessage.php
@@ -20,7 +20,10 @@ abstract class lnApp_SystemMessage extends HTMLRender {
 	public function __call($name,$args=NULL) {
 		parent::__call($name,$args);
 
-		Session::instance()->set('sessionmsgs',static::$_data);
+		// If we are a CLI session, then we have no session
+		if (PHP_SAPI !== 'cli')
+			Session::instance()->set('sessionmsgs',static::$_data);
+
 		return $this;
 	}
 
diff --git a/views/errors/500.php b/views/errors/500.php
new file mode 100644
index 0000000..75d03ea
--- /dev/null
+++ b/views/errors/500.php
@@ -0,0 +1,6 @@
+<h1>Oops!</h1>
+<h2>500 Bother, something went wrong.</h2>
+<?php echo $message; ?>
+<div class="error-details">
+	If this keeps happening, please let us know.
+</div>