starting to work on fixing the false positives, and handle situations where custom identity is not found
working on handling errors and custom identities not being found