Fixed potential "crash on update" situation
Preparing for nat-upnp