Fix 502s

should fix up a few 502s that have been reaching users