Fixes for errors posted on facepunch

These are some small temporary fixes while a real solution can be found.
The DNA fix shouldn't be necessary because the retriever should never be nil.