diff --git a/parity/helpers.rs b/parity/helpers.rs
index 39a88be33..ad67e1436 100644
--- a/parity/helpers.rs
+++ b/parity/helpers.rs
@@ -102,7 +102,7 @@ pub fn to_address(s: Option<String>) -> Result<Address, String> {
 
 pub fn to_addresses(s: &Option<String>) -> Result<Vec<Address>, String> {
 	match *s {
-		Some(ref adds) if adds.is_empty() => adds.split(',')
+		Some(ref adds) if !adds.is_empty() => adds.split(',')
 			.map(|a| clean_0x(a).parse().map_err(|_| format!("Invalid address: {:?}", a)))
 			.collect(),
 		_ => Ok(Vec::new()),
@@ -299,7 +299,7 @@ mod tests {
 	use util::{U256};
 	use ethcore::client::{Mode, BlockID};
 	use ethcore::miner::PendingSet;
-	use super::{to_duration, to_mode, to_block_id, to_u256, to_pending_set, to_address, to_price, geth_ipc_path, to_bootnodes};
+	use super::{to_duration, to_mode, to_block_id, to_u256, to_pending_set, to_address, to_addresses, to_price, geth_ipc_path, to_bootnodes};
 
 	#[test]
 	fn test_to_duration() {
@@ -370,6 +370,18 @@ mod tests {
 		assert_eq!(to_address(None).unwrap(), Default::default());
 	}
 
+	#[test]
+	fn test_to_addresses() {
+		let addresses = to_addresses(&Some("0xD9A111feda3f362f55Ef1744347CDC8Dd9964a41,D9A111feda3f362f55Ef1744347CDC8Dd9964a42".into())).unwrap();
+		assert_eq!(
+			addresses,
+			vec![
+				"D9A111feda3f362f55Ef1744347CDC8Dd9964a41".parse().unwrap(),
+				"D9A111feda3f362f55Ef1744347CDC8Dd9964a42".parse().unwrap(),
+			]
+		);
+	}
+
 	#[test]
 	#[cfg_attr(feature = "dev", allow(float_cmp))]
 	fn test_to_price() {
diff --git a/parity/run.rs b/parity/run.rs
index 45b844ef0..5db330708 100644
--- a/parity/run.rs
+++ b/parity/run.rs
@@ -311,7 +311,7 @@ fn prepare_account_provider(dirs: &Directories, cfg: AccountsConfig) -> Result<A
 
 	for a in cfg.unlocked_accounts {
 		if passwords.iter().find(|p| account_service.unlock_account_permanently(a, (*p).clone()).is_ok()).is_none() {
-			return Err(format!("No password given to unlock account {}. Pass the password using `--password`.", a));
+			return Err(format!("No password found to unlock account {}. Make sure valid password is present in files passed using `--password`.", a));
 		}
 	}