Merge "Modify catch when addInterfaceToLocalNetwork() is called."