UPDATE: Return better response code