Fix NPE, Fix string