Fix conversion NPE