KNIFE-386: Code review feedback
Check return status to handle 401s caught downstream
Get comments in sync with code change to handle instead of ignore errors