diff --git a/upload/config.php b/upload/config.php
index 98054fd37..5ccd0d895 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -56,8 +56,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 Beta';
-$bb_cfg['tp_release_state'] = 'R431';
-$bb_cfg['tp_release_date'] = '05-06-2012';
+$bb_cfg['tp_release_state'] = 'R432';
+$bb_cfg['tp_release_date'] = '06-06-2012';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index f63bc3dcd..181cb6ed4 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -1863,6 +1863,7 @@ function obtain_word_list(&$orig_word, &$replacement_word)
 	if (!$sql = CACHE('bb_cache')->get('censored'))
 	{
 		$sql = DB()->fetch_rowset("SELECT word, replacement FROM ". BB_WORDS);
+		if(!$sql) $sql = array(array('word' => 1, 'replacement' => 1));
 		CACHE('bb_cache')->set('censored', $sql, 7200);
 	}
 
@@ -2879,6 +2880,6 @@ function seo_link_header($str){
 
 	$regexp = "/{$str}\.php/";
 	$return = ($bb_cfg['seo_link_home_page']) ? ((preg_match($regexp, $_SERVER['SCRIPT_NAME'])) ? false : true) : true;
-	
+
 	return $return;
 }
\ No newline at end of file