Fix NPE in aspect