Service directory check.

Just one more check. Sorry for another pull request, but the old one is already merged.