Updates to remove frequent and unnecessary error logging