* Fix 500 and add test for it * Return an empty object so the logic later will still execute * Update tests