Handle invalid service URLs without a server error.
Merge branch 'develop'