Fixing NPEs associated with AE2