Stop using hacky rescue 'OK'