make the missing server case better
Merge pull request #1532 from edx/e0d/minos-fixes

make the missing server case better