Fixed exception handling closes #2009
Another fix for logging UPNP errors closes #2009
Merge pull request #2032 from getlantern/2009

Fixed exception handling closes #2009