diff --git a/e107_core/shortcodes/single/nextprev.php b/e107_core/shortcodes/single/nextprev.php
index d7c57ef3b..45406c0f3 100644
--- a/e107_core/shortcodes/single/nextprev.php
+++ b/e107_core/shortcodes/single/nextprev.php
@@ -68,7 +68,7 @@ function nextprev_shortcode($parm = '')
 	 * New parameter requirements formatted as a GET string.
 	 * Template support.
 	 */
-	if(strpos($parm, 'total=') !== false)
+	if(is_string($parm) && strpos($parm, 'total=') !== false)
 	{
 		parse_str($parm, $parm);
 
@@ -363,6 +363,10 @@ function nextprev_shortcode($parm = '')
 	 */
 	else
 	{
+		if(empty($parm))
+		{
+			$parm = '';
+		}
 		$parm_count = substr_count($parm, ',');
 		while($parm_count < 5)
 		{
diff --git a/e107_plugins/linkwords/e_tohtml.php b/e107_plugins/linkwords/e_tohtml.php
index eec27a0b0..1700f54fa 100755
--- a/e107_plugins/linkwords/e_tohtml.php
+++ b/e107_plugins/linkwords/e_tohtml.php
@@ -245,7 +245,9 @@ class e_tohtml_linkwords
 
 		// Consider next line - stripos is PHP5, and mb_stripos is PHP >= 5.2 - so may well often require handling
 //		while (($first < $limit) && (stripos($text,$this->word_list[$first]) === FALSE))   { $first++; };		// *utf   (stripos is PHP5 - compatibility handler implements)
-		while (($first < $limit) && (strpos($tp->ustrtolower($text), $this->word_list[$first]) === false))
+		$needle = $this->word_list[$first];
+
+		while (($first < $limit) && (strpos($tp->ustrtolower($text), $needle) === false))
 		{
 			$first++;
 		}		// *utf