Fixed an issue with AESSecurity erroring out.
Another error fix for AESSecurity.
Merge backwards from master.