Better handling for OK:errors