Fix NPE in astavarga