You can keep your old phone around for it but they should solve the problem. Motorola can likely help us with getting it resolved once things are further along.