Telephony: fix possible NPE due to merge failure