Repaired an NPE