Added  DBServer.NONE to the enum. 
Fixed a potential nullpointerexception.
Moved initialization of three variables to after a possible exit point.
Minor cleanup.