Fix NPE in AOE