Handle empty master server responses

Closes #12