Small cosmetic changes
Fix DNS error handler
Second try on #11