Better handling of OK response