Refs #8257. Adding better lockout finding.