Add revised error handling to coreShield procs