Pull1

Some small changes. Return an DNS error when needed.