Change status code for invalid address to 400