diff --git a/admin-dev/themes/default/template/controllers/modules/list.tpl b/admin-dev/themes/default/template/controllers/modules/list.tpl
index 63c992c5f..08ca29d34 100644
--- a/admin-dev/themes/default/template/controllers/modules/list.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/list.tpl
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA

+*  @copyright  2007-2013 PrestaShop SA
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
@@ -87,7 +87,7 @@
 								<ul id="list-action-button">
 									{if isset($module->type) && $module->type == 'addonsMustHave'}
 										<li>
-											<a href="{$module->addons_buy_url}" target="_blank" class="button updated"><span><img src="../img/admin/cart_addons.png">&nbsp;&nbsp;{displayPrice price=$module->price currency=$module->id_currency}</span></a>
+											<a href="{$module->addons_buy_url}" target="_blank" class="button updated"><span><img src="../img/admin/cart_addons.png">&nbsp;&nbsp;{if isset($module->id_currency) && isset($module->price)}{displayPrice price=$module->price currency=$module->id_currency}{/if}</span></a>
 										</li>
 									{else}
 										{if $module->id && isset($module->version_addons) && $module->version_addons}
diff --git a/classes/module/Module.php b/classes/module/Module.php
index 6289caa70..73e3c4c35 100644
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -1177,12 +1177,12 @@ abstract class ModuleCore
 								$id_default_currency = Configuration::get('PS_CURRENCY_DEFAULT');
 								foreach ($prices as $currency => $price)
 									if ($id_currency = Currency::getIdByIsoCode($currency))
-										if ($id_default_currency == $id_currency)
-										{
+									{
 											$item->price = (float)$price;
 											$item->id_currency = (int)$id_currency;
-										}
-										
+											if ($id_default_currency == $id_currency)
+												break;
+									}
 							}
 							$module_list[] = $item;
 						}