Better response code management