Refactor out server check for all providers

Closes #49