Removed nicely named label and some gotos from upnp_device.c