Added return to http handlers