I think these changes reflect what's being asked for in the ticket. The issue is that an exception is being reported when the hcid isn't found, but the hcid is being search for in two places. Therefore an alarming exception is being displayed when there really isn't a problem.