Minor cleanup
Attempt to fix NPE spam when MySQL connection failed
This is how it was before my cleanup, I find what the
methods do and/or how they're named a little weird,
We may want to do something about it.