diff --git a/db/smsmapper.php b/db/smsmapper.php
index 63af4ab..1e330ba 100644
--- a/db/smsmapper.php
+++ b/db/smsmapper.php
@@ -136,15 +136,13 @@ class SmsMapper extends Mapper {
 		if(isset($phoneList[$fpn])) {
 			return $phoneList[$fpn];
 		}
-		else {
-			$fpn = PhoneNumberFormatter::format($country, $fpn);
-			if (isset($phoneList[$fpn])) {
-				return $phoneList[$fpn];
-			}
-		}
-		else {
-			return array();
+		
+		$fpn = PhoneNumberFormatter::format($country, $fpn);
+		if (isset($phoneList[$fpn])) {
+			return $phoneList[$fpn];
 		}
+			
+		return array();
 	}
 
 	public function getAllMessagesForPhoneNumber ($userId, $phoneNumber, $country, $minDate = 0) {