use PhoneNumberWaiter when NPE

Change-Id: I2b79d72d553e6b014f1cc853244f8052f7f8e4ca