diff --git a/inc/display.php b/inc/display.php
index fb1a3379..763fcd97 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -66,6 +66,12 @@
 		global $board, $mod, $config;
 		
 		if(function_exists('sql_close')) sql_close();
+		
+		if(defined('STDIN')) {
+			// Running from CLI
+			die('Error: ' . $message);
+		}
+		
 		die(Element('page.html', Array(
 			'config'=>$config,
 			'title'=>'Error',