diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php
index 1648219e44..55209cd02c 100644
--- a/phpBB/groupcp.php
+++ b/phpBB/groupcp.php
@@ -162,7 +162,7 @@ if ( isset($HTTP_POST_VARS['groupstatus']) && $group_id )
 
 	if (!isset($HTTP_POST_VARS['sid']) || $HTTP_POST_VARS['sid'] != $userdata['session_id'])
 	{
-		message_die(ERROR, 'Invalid_session');
+		message_die(GENERAL_ERROR, 'Invalid_session');
 	}
 
 	$sql = "SELECT group_moderator 
@@ -216,7 +216,7 @@ else if ( isset($HTTP_POST_VARS['joingroup']) && $group_id )
 
 	if (!isset($HTTP_POST_VARS['sid']) || $HTTP_POST_VARS['sid'] != $userdata['session_id'])
 	{
-		message_die(ERROR, 'Invalid_session');
+		message_die(GENERAL_ERROR, 'Invalid_session');
 	}
 
 	$sql = "SELECT ug.user_id, g.group_type
@@ -326,7 +326,7 @@ else if ( isset($HTTP_POST_VARS['unsub']) || isset($HTTP_POST_VARS['unsubpending
 
 	if (!isset($HTTP_POST_VARS['sid']) || $HTTP_POST_VARS['sid'] != $userdata['session_id'])
 	{
-		message_die(ERROR, 'Invalid_session');
+		message_die(GENERAL_ERROR, 'Invalid_session');
 	}
 
 	if ( $confirm )
@@ -475,7 +475,7 @@ else if ( $group_id )
 
 			if (!isset($HTTP_POST_VARS['sid']) || $HTTP_POST_VARS['sid'] != $userdata['session_id'])
 			{
-				message_die(ERROR, 'Invalid_session');
+				message_die(GENERAL_ERROR, 'Invalid_session');
 			}
 
 			if ( !$is_moderator )
diff --git a/phpBB/modcp.php b/phpBB/modcp.php
index 5a52610e4d..d49085fa63 100644
--- a/phpBB/modcp.php
+++ b/phpBB/modcp.php
@@ -165,7 +165,7 @@ init_userprefs($userdata);
 // session id check
 if ($sid == '' || $sid != $userdata['session_id'])
 {
-	message_die(ERROR, 'Invalid_session');
+	message_die(GENERAL_ERROR, 'Invalid_session');
 }
 
 //
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php
index 3ac9248146..20f8481d28 100644
--- a/phpBB/privmsg.php
+++ b/phpBB/privmsg.php
@@ -667,7 +667,7 @@ else if ( ( $delete && $mark_list ) || $delete_all )
 	// session id check
 	if ($sid == '' || $sid != $userdata['session_id'])
 	{
-		message_die(ERROR, 'Invalid_session');
+		message_die(GENERAL_ERROR, 'Invalid_session');
 	}
 
 	if ( isset($mark_list) && !is_array($mark_list) )
@@ -896,7 +896,7 @@ else if ( $save && $mark_list && $folder != 'savebox' && $folder != 'outbox' )
 	// session id check
 	if ($sid == '' || $sid != $userdata['session_id'])
 	{
-		message_die(ERROR, 'Invalid_session');
+		message_die(GENERAL_ERROR, 'Invalid_session');
 	}
 	
 	if (sizeof($mark_list))
@@ -1145,7 +1145,7 @@ else if ( $submit || $refresh || $mode != '' )
 		// session id check
 		if ($sid == '' || $sid != $userdata['session_id'])
 		{
-			message_die(ERROR, 'Invalid_session');
+			message_die(GENERAL_ERROR, 'Invalid_session');
 		}
 
 		if ( !empty($HTTP_POST_VARS['username']) )
diff --git a/phpBB/search.php b/phpBB/search.php
index fef6219c0b..0da49d490a 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -1319,7 +1319,7 @@ $template->assign_vars(array(
 	'S_CATEGORY_OPTIONS' => $s_categories, 
 	'S_TIME_OPTIONS' => $s_time, 
 	'S_SORT_OPTIONS' => $s_sort_by,
-	'S_HIDDEN_FIELDS' => $s_hidden_fields)
+	'S_HIDDEN_FIELDS' => '')
 );
 
 $template->pparse('body');