Merge pull request #1016 from kevincupp/develop

Adding in a few 503 status codes for common errors