Merge "Also catch IllegalArgumentException in TelecomAccountRegistry"