Handle coverity issues related to recently merged HS client auth