snapshot-9 - added better checking for nonauthenticated