Bringing response code in line with Steve's changes