Fixed NPE regresion in augmentation handling.