diff --git a/admin/panels/plugin/admin.plugin.tpl b/admin/panels/plugin/admin.plugin.tpl
index 4ef9c1b..b35acb5 100644
--- a/admin/panels/plugin/admin.plugin.tpl
+++ b/admin/panels/plugin/admin.plugin.tpl
@@ -19,26 +19,26 @@
 	</thead>
 	<tbody id="plugin-table-body">
 	{foreach from=$pluginlist item=plugin}
-	{assign var=inarr value=$plugin|in_array:$enabledlist}
-	{$plugin|plugin_getinfo}
-	<tr{if $inarr} class="enabled" {/if}>
-		<td> {$name} </td>
-		<td class="main-cell"> {$description} </td>
-		<td> {$author} </td>
-		<td> {$version} </td>
-		<td> {if $inarr} 
-			<a class="link-disable"
-			href="{$action_url|cmd_link:disable:$plugin}"> 
-				{$panelstrings.disable}
-			</a> 
-			{else}
-			<a class="link-enable" 
-			href="{$action_url|cmd_link:enable:$plugin}"> 
-				{$panelstrings.enable}
-			</a> 
-			{/if}
-		</td>
-	</tr>
+		{assign var=inarr value=$plugin|in_array:$enabledlist}
+		{assign var=plugininfo value=$plugin|plugin_getinfo}
+		<tr{if $inarr} class="enabled" {/if}>
+			<td> {$plugininfo.name} </td>
+			<td class="main-cell"> {$plugininfo.description} </td>
+			<td> {$plugininfo.author} </td>
+			<td> {$plugininfo.version} </td>
+			<td> {if $inarr} 
+				<a class="link-disable"
+				href="{$action_url|cmd_link:disable:$plugin}"> 
+					{$panelstrings.disable}
+				</a> 
+				{else}
+				<a class="link-enable" 
+				href="{$action_url|cmd_link:enable:$plugin}"> 
+					{$panelstrings.enable}
+				</a> 
+				{/if}
+			</td>
+		</tr>
 	{/foreach}
 	</tbody>
 	</table>
diff --git a/fp-includes/core/core.plugins.php b/fp-includes/core/core.plugins.php
index 4312471..4eb25af 100644
--- a/fp-includes/core/core.plugins.php
+++ b/fp-includes/core/core.plugins.php
@@ -213,14 +213,13 @@ function plugin_getinfo($plugin) {
 		$author = '<a href="' . trim($author_uri [1]) . '">' . trim($author_name [1]) . '</a>';
 	}
 
-	global $smarty;
-	$smarty->assign(array(
+	return array(
 		'name' => $name,
 		'title' => $plugin,
 		'description' => $description,
 		'author' => $author,
 		'version' => $version
-	));
+	);
 }
 
 $_FP_SMARTY->registerPlugin('function', 'plugin_getdir', 'smarty_function_plugin_getdir');
diff --git a/fp-interface/sharedtpls/errorlist.tpl b/fp-interface/sharedtpls/errorlist.tpl
index 941b49e..42419cd 100644
--- a/fp-interface/sharedtpls/errorlist.tpl
+++ b/fp-interface/sharedtpls/errorlist.tpl
@@ -13,7 +13,7 @@
 		</ul>
 		{/if}
 		
-		{if isset($warnings)}
+		{if isset($warnings) && !empty($warnings)}
 		<ul class="msgs warnings">
 			{foreach from=$warnings key=field item=msg}
 			<li>