Check to make sure current server exists on database
Merge pull request #1 from Bloodsplat/master

Merge