diff --git a/upgrade/definitions/0.0.11_to_0.0.12.inc.php b/upgrade/definitions/0.0.11_to_0.0.12.inc.php
index f4ad2b30..7c065da7 100644
--- a/upgrade/definitions/0.0.11_to_0.0.12.inc.php
+++ b/upgrade/definitions/0.0.11_to_0.0.12.inc.php
@@ -10,7 +10,7 @@ function run_0012() {
 
   // Upgrade specific variables
   $aSql[] = "CREATE TABLE `coin_addresses` ( `id` int(11) NOT NULL AUTO_INCREMENT, `account_id` int(11) NOT NULL, `currency` varchar(55555) NOT NULL, `coin_address` varchar(255) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `coin_address` (`coin_address`), KEY `account_id` (`account_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8";
-  $aSql[] = "INSERT INTO coin_addresses (account_id, currency, coin_address) SELECT id, '" . $config['currency'] . "', coin_address FROM " . $user->getTableName();
+  $aSql[] = "INSERT INTO coin_addresses (account_id, currency, coin_address) SELECT id, '" . $config['currency'] . "', coin_address FROM " . $user->getTableName() . " WHERE coin_address != NULL AND coin_address != ''";
   $aSql[] = "ALTER TABLE `" . $user->getTableName() . "` DROP `coin_address`";
   $aSql[] = "UPDATE " . $setting->getTableName() . "    SET value = '0.0.12' WHERE name = 'DB_VERSION'";