Fix lack of return after 500 handling