DR-122 Not all 500s are logged

Branch: dr-122

reviewed by @steveb