Fix HTTP 503 issues
Merge pull request #63 from latentflip/fix-503

Fix HTTP 503 issues