adjust highwater check location to avoid masking return value

adjust highwater check location to avoid masking return value #477