AE: fix segfault after indirection patches
Merge pull request #2289 from fritsch/ae-segfault-fix

AE: Fix segfault after indirection patches