diff --git a/phpBB/search.php b/phpBB/search.php
index 84edb41c72..b621252738 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -1163,6 +1163,10 @@ else if ( $search_keywords != '' || $search_author != '' || $search_id )
 
 		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 	}
+	else
+	{
+		message_die(GENERAL_MESSAGE, $lang['No_search_match']);
+	}
 }
 
 //
@@ -1294,4 +1298,4 @@ $template->pparse('body');
 
 include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 
-?>
\ No newline at end of file
+?>