Added fallback errors for 502, 503
Merge branch 'release'